Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 May 2010 21:37:06 +0000 (22:37 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 May 2010 21:37:06 +0000 (22:37 +0100)
commit941f81c16ec7497ecce6f1f611277d67e89bdfe1
tree4543aa365058fc52f051ea4881e1dc231f39774c
parente220ba60223a9d63e70217e5b112160df8c21cea
parent478ea14466fb524b4cd90cdf0b8845f8c5ee6015
Merge branch 'master' of git://git.infradead.org/users/cbou/linux-cns3xxx into devel-stable
arch/arm/Kconfig