Merge remote-tracking branch 'arm/for-next'
commit2d31d603839b9bc4d8d020a72f7e11d13963fd74
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Aug 2011 01:00:53 +0000 (25 11:00 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 25 Aug 2011 01:00:53 +0000 (25 11:00 +1000)
tree31d6095e8e6a93d2c3ee7c854e2bdee575f965e8
parent1c669c153f62e1367b72a3f6af287de4a0c77b51
parentd1442ac9e4565922bc264a297d3d7ac62f742dec
Merge remote-tracking branch 'arm/for-next'
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-mackerel.c
drivers/tty/serial/atmel_serial.c