Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 22 Oct 2008 18:33:50 +0000 (19:33 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 22 Oct 2008 18:33:50 +0000 (19:33 +0100)
commitbcbfe664e7af019e698cef2feb85ac2b4f1ac11d
treebade11b3088e3768612ecb2cd6e285ab67a23286
parentf6335c43f3d7816ba2e69abce4f29c41f65bb27e
parent175854be81dc42b70591760c193113e4898b3e6f
Merge branch 'for-rmk' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
arch/arm/mach-pxa/Kconfig