]> git.baikalelectronics.ru Git - kernel.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)
commit8963a945df9c4613590bed3690b24e7897e4f25c
tree6bc244a1c49221335e14bf795403debf6f24712d
parent34246e4c502ac282633f3eafc395e419462ff184
parent39306222502568928082ffa99a1b66f7bf04546a
Merge branch 'fb' into devel

Conflicts:

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