Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

* 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Enable NMI on all cpus on UV
  vgaarb: Add user selectability of the number of GPUS in a system
  vgaarb: Fix VGA arbiter to accept PCI domains other than 0
  x86, uv: Update UV arch to target Legacy VGA I/O correctly.
  pci: Update pci_set_vga_state() to call arch functions

diff --cc arch/x86/kernel/smpboot.c
Simple merge

diff --cc drivers/gpu/vga/vgaarb.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc include/linux/pci.h
Simple merge