| commit | 3fbd55ec21e698221ffb43526090137b07c32586 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Jun 18 20:11:32 2013 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue Jun 18 20:11:32 2013 +0100 |
| tree | 421349dff22226b6b85188a5bf8b0bc6e167dfeb | |
| parent | b3f288de7c8add67a3364e989b865b6537838662 [diff] | |
| parent | a469abd0f868c902b75532579bf87553dcf1b360 [diff] |
Merge branch 'for-rmk/lpae' of git://git.kernel.org/pub/scm/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.