summaryrefslogtreecommitdiff
path: root/fs/qnx4
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 20:31:32 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-25 20:31:32 -0800
commit36ddf5bbdea7ba4582abc62f106f0f0e9f0b6b91 (patch)
tree163d637dfda12eba3f8822d3b2941869b2d0ba00 /fs/qnx4
parenta41622eaa97e40c811fb7756f403c0d4caa65654 (diff)
parent104c7b03ea0913a24be103db66d8cf1f1f99a49a (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial: [ARM] 3383/3: ixp2000: ixdp2x01 platform serial conversion [SERIAL] amba-pl010: Remove accessor macros [SERIAL] remove 8250_acpi (replaced by 8250_pnp and PNPACPI) [SERIAL] icom: select FW_LOADER
Diffstat (limited to 'fs/qnx4')
0 files changed, 0 insertions, 0 deletions