diff options
| author | Linus Torvalds <[email protected]> | 2010-02-28 18:59:18 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-02-28 18:59:18 +0000 |
| commit | c7e15899d07c9813c1aa96b21699d2d9c8314c4b (patch) | |
| tree | 16e9b4dceddf1b4d1dad05588d700c70cf8fcb88 /lib/debugobjects.c | |
| parent | Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | x86: Enable NMI on all cpus on UV (diff) | |
| download | kernel-c7e15899d07c9813c1aa96b21699d2d9c8314c4b.tar.gz kernel-c7e15899d07c9813c1aa96b21699d2d9c8314c4b.zip | |
Merge branch 'x86-pci-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'lib/debugobjects.c')
0 files changed, 0 insertions, 0 deletions