projects / profile / common / kernel-common.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f6a0b5c 78c0617)
Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Feb 2010 18:59:18 +0000 (10:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 28 Feb 2010 18:59:18 +0000 (10:59 -0800)
commitc7e15899d07c9813c1aa96b21699d2d9c8314c4b
tree16e9b4dceddf1b4d1dad05588d700c70cf8fcb88tree | snapshot
parentf6a0b5cd34d6e922cc7258c5429fb0f17508ceb6commit | diff
parent78c06176466cbd1b3f0f67709d3023c40dbebcbdcommit | diff
Merge branch 'x86-pci-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* '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
arch/x86/kernel/smpboot.c diff1 | diff2 | blob | history
drivers/gpu/vga/vgaarb.c diff1 | diff2 | blob | history
drivers/pci/pci.c diff1 | diff2 | blob | history
include/linux/pci.h diff1 | diff2 | blob | history
Domain: SCM / Uncategorized;