Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Jan 2010 22:11:32 +0000 (22:11 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 27 Jan 2010 22:11:32 +0000 (22:11 +0000)
commita814290e17ae314bd614476cffc6119846eca27e
tree9fc40e6a34cd275bedcd2344383bd5e84f6c20df
parente55d1936f207f81c4e225d6c513e0fa487e544c5
parentab5d97db1c6ced3e95c00d097931471707032b1f
Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable
arch/arm/mach-pxa/Kconfig