git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 79403cd e5b61de 6c5c2a0)
Merge branches 'misc', 'vdso' and 'fixes' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 14 Apr 2015 21:28:25 +0000 (22:28 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 14 Apr 2015 21:28:25 +0000 (22:28 +0100)
Conflicts:
arch/arm/mm/proc-macros.S


Trivial merge
Pandora Kernel Repository