Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 23:09:30 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 23:09:30 +0000 (15:09 -0800)
commit3995f4c5327595b51482bdac8c189736262eb6e0
treeef768d0ecf243a2376bfc646b847964313146d3e
parent05814450070f13b671fc9dbf89477677aa0258cb
parentfe38ea5623d262afc0b92ea47b8a7d8c988521d2
Merge master.kernel.org:/home/rmk/linux-2.6-arm
drivers/serial/Kconfig