git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b3f288d a469abd)
Merge branch 'for-rmk/lpae' of git://git.kernel.org/pub/scm/linux/kernel/git/will...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 18 Jun 2013 19:11:32 +0000 (20:11 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 18 Jun 2013 19:11:32 +0000 (20:11 +0100)
Conflicts:
arch/arm/kernel/smp.c

Please pull these miscellaneous LPAE fixes I've been collecting for a while
now for 3.11. They've been tested and reviewed by quite a few people, and most
of the patches are pretty trivial. -- Will Deacon.


Trivial merge
Pandora Kernel Repository