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)
1  2 
arch/arm/mach-pxa/Kconfig

Simple merge