Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
commitfdb0a1a67e131f07a308730c80d07e330211d2e0
tree4fbf35055fc965737c1ffdbcfe98d7ea8335f940
parentfc0b7a20368193e1f7cf1376624eed419b9c33e6
parent7bb56d01f111890414fbe35412698485b68ed468
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
arch/arm/Kconfig
arch/arm/Makefile