diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:17:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-12 21:17:41 -0700 |
commit | d3745f46e32d86de188cf378f923b7a2ed5274f9 (patch) | |
tree | b6ad64cbd41644de503a15ce3669e00ec602db8f /block | |
parent | 70d002bccac5e107fafb95e83fcb7fc010a88695 (diff) | |
parent | ffadcc2ff42ecedf71ea67d9051ff028927aed08 (diff) |
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 of HEAD
* HEAD:
[PATCH] PCI: PCIE power management quirk
[PATCH] PCI: add PCI Express AER register definitions to pci_regs.h
[PATCH] PCI: Clear abnormal poweroff flag on VIA southbridges, fix resume
[PATCH] PCI: poper prototype for arch/i386/pci/pcbios.c:pcibios_sort()
Diffstat (limited to 'block')
0 files changed, 0 insertions, 0 deletions