Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 23 Aug 2011 09:54:51 +0000 (10:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 23 Aug 2011 09:54:51 +0000 (10:54 +0100)
commitad30a2bbdc20cf0111156e2aa6d2cc3e3c0d1893
tree07e491fd3b782d47811a1b3d31d51b0a0d4630df
parent0cd21ebcc51e6d2500e303446f68d86a6f473ccb
parentaf6871683e25100813d35b3d802f1ed7b90b9f3a
Merge branch 'atag_offset' of git://git.linaro.org/people/nico/linux into devel-stable
arch/arm/mach-u300/include/mach/memory.h