git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f412b09 b5ee900)
Merge branch 'highmem' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 28 Nov 2008 15:39:02 +0000 (15:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 28 Nov 2008 15:39:02 +0000 (15:39 +0000)
Conflicts:

arch/arm/mach-clps7500/include/mach/memory.h


Trivial merge
Pandora Kernel Repository