]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'imx' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 10 Jul 2008 15:41:50 +0000 (16:41 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 10 Jul 2008 15:41:50 +0000 (16:41 +0100)
Conflicts:

arch/arm/mm/Kconfig


No differences found