From: Russell King Date: Tue, 18 Jun 2013 19:11:32 +0000 (+0100) Subject: Merge branch 'for-rmk/lpae' of git://git.kernel.org/pub/scm/linux/kernel/git/will... X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~41^2^2~3 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fbd55ec21e698221ffb43526090137b07c32586;p=pandora-kernel.git 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. --- 3fbd55ec21e698221ffb43526090137b07c32586 Reading git-diff-tree failed