git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed40d0c f0bba9f)
Merge branch 'master' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 28 Mar 2009 20:30:18 +0000 (20:30 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 28 Mar 2009 20:30:18 +0000 (20:30 +0000)
Conflicts:
arch/arm/include/asm/elf.h
arch/arm/kernel/module.c


Trivial merge
Pandora Kernel Repository