]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit946e2ad040000a14b7316fae722e7e65fa09ffe5
tree6bc244a1c49221335e14bf795403debf6f24712d
parent543cf4cb3fe6f6cae3651ba918b9c56200b257d0
parente055d5bff318845f99c0fbf93245767fab8dce88
Merge branch 'fb' into devel

Conflicts:

arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/Makefile