From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Jan 2013 17:11:50 +0000 (-0800)
Subject: Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2409c873be56278ea41c345b453f76813e5c3fed;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'x86/urgent' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Peter Anvin:
 "This is mainly a workaround for a bug in Sandy Bridge graphics which
  causes corruption of certain memory pages."

* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/Sandy Bridge: Sandy Bridge workaround depends on CONFIG_PCI
  x86/Sandy Bridge: mark arrays in __init functions as __initconst
  x86/Sandy Bridge: reserve pages when integrated graphics is present
  x86, efi: correct precedence of operators in setup_efi_pci
---

2409c873be56278ea41c345b453f76813e5c3fed