tree 749750109b4f9c44c1dbc5b2e209f3ff72ae44bf
parent c4ef9bc4f7e1807d499d3d427712df9f8aa2dcbb
parent e43b3cec711a61edf047adf6204d542f3a659ef8
author Linus Torvalds <torvalds@linux-foundation.org> 1358356310 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1358356310 -0800

Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/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