git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ddf90a2 0ec8e7a)
Merge branch 'misc' into for-linus
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:24 +0000 (15:15 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 21 May 2012 14:15:24 +0000 (15:15 +0100)
Conflicts:
arch/arm/kernel/ptrace.c


Trivial merge
Pandora Kernel Repository