]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
Merge branch 'fb' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 3 Jul 2008 15:13:28 +0000 (16:13 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 3 Jul 2008 15:13:28 +0000 (16:13 +0100)
Conflicts:

arch/arm/Kconfig

1  2 
arch/arm/Kconfig
arch/arm/Makefile

Simple merge
Simple merge