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)
commit3fbd55ec21e698221ffb43526090137b07c32586
tree421349dff22226b6b85188a5bf8b0bc6e167dfeb
parentb3f288de7c8add67a3364e989b865b6537838662
parenta469abd0f868c902b75532579bf87553dcf1b360
Merge branch 'for-rmk/lpae' of git://git./linux/kernel/git/will/linux into devel-stable

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.
arch/arm/include/asm/pgtable-3level-hwdef.h
arch/arm/include/asm/pgtable-3level.h
arch/arm/include/asm/proc-fns.h
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c