]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
1  2 
arch/arm/mach-pxa/Kconfig

Simple merge