| commit | d3745f46e32d86de188cf378f923b7a2ed5274f9 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@g5.osdl.org> | Wed Jul 12 21:17:41 2006 -0700 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Wed Jul 12 21:17:41 2006 -0700 |
| tree | b6ad64cbd41644de503a15ce3669e00ec602db8f | |
| 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()