Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit1dd465cac8d3ba18a9840d032f6604147269c031
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Sep 2005 15:39:56 +0000 (30 08:39 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 30 Sep 2005 15:39:56 +0000 (30 08:39 -0700)
tree78f00fdeae26d018def75e7517aa50e56f4994df
parenta2218cac0aacecbecebd3cabc43cc8a4a09cecbb
parent217874feed0d3a6543a6b7127782f4a08bffd731
Merge master.kernel.org:/home/rmk/linux-2.6-arm
arch/arm/mach-versatile/core.c
drivers/mtd/maps/ixp4xx.c
drivers/serial/s3c2410.c