summaryrefslogtreecommitdiffstats
path: root/drivers/serial/8250.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 15:20:40 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 15:20:40 -0800
commitcce0cac125623f9b68f25dd1350f6d616220a8dd (patch)
tree123a4dd9f040d05e42cadb6b01f301d6863b897f /drivers/serial/8250.h
parentf564c5fe29d3fa9adc6d839714521b0554c62598 (diff)
parent18f49ea207fbcf37f81395037f0dc1cacb2aac3c (diff)
downloadblackbird-op-linux-cce0cac125623f9b68f25dd1350f6d616220a8dd.tar.gz
blackbird-op-linux-cce0cac125623f9b68f25dd1350f6d616220a8dd.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Manual conflict merge of arch/arm/Kconfig
Diffstat (limited to 'drivers/serial/8250.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud