summaryrefslogtreecommitdiff
path: root/include/soc/brcmstb
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-12-12 12:17:31 +0000
committerMark Brown <broonie@kernel.org>2016-12-12 12:17:31 +0000
commitd00b74613fb18dfd0a5aa99270ee2e72d5c808d7 (patch)
treea4a76197dc9cc07a9b64c3834bfc4f139f6447ef /include/soc/brcmstb
parent56e3d92ddb97d9584622b29d4ecb268e30242b1e (diff)
parentf8192880a102849d84fe0f5e27bc8625a33e031c (diff)
parent3498c5e15db3af90aee7dbe9a0910225422b85c1 (diff)
Merge remote-tracking branches 'regulator/topic/tps65086' and 'regulator/topic/twl' into regulator-next
dware, as this commit: ab72a27da ("x86/efi: Consolidate region mapping logic") later made the first physical frame not to be mapped anyway. Reported-by: Hanka Pavlikova <hanka@ucw.cz> Signed-off-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Borislav Petkov <bp@suse.de> Cc: Laura Abbott <labbott@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Vojtech Pavlik <vojtech@ucw.cz> Cc: Waiman Long <waiman.long@hpe.com> Cc: linux-efi@vger.kernel.org Cc: stable@kernel.org # v4.8+ Fixes: 129766708 ("x86/efi: Only map RAM into EFI page tables if in mixed-mode") Link: http://lkml.kernel.org/r/20170127222552.22336-1-matt@codeblueprint.co.uk [ Tidied up the changelog and the comment. ] Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/net/transp_v6.h')