Merge branch 'picoxcell/soc' into next/soc
authorArnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 01:46:17 +0000 (02:46 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 2 Nov 2011 01:46:17 +0000 (02:46 +0100)
commitb8df0ea26ac17c9a073f235c7fdfbdd1851b59ea
tree5e57a2fdc5fa05155d7d8214ad054b16f6b1c3d8
parent884897e6a10a86de0e611a76f4bf3fd0068a672c
parent76780127914d5dc69a458eda5e471e65a5fd3dc9
Merge branch 'picoxcell/soc' into next/soc
arch/arm/Kconfig
arch/arm/Makefile