tree ff56854943219c16f51e18c5360b9626c3a20474
parent b07d41b77e58baa2df2326cec68dde03cb2348c5
parent 2d1c861871d767153538a77c498752b36d4bb4b8
author Linus Torvalds <torvalds@linux-foundation.org> 1262207604 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262207604 -0800

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
  PCI/cardbus: Add a fixup hook and fix powerpc
  PCI: change PCI nomenclature in drivers/pci/ (non-comment changes)
  PCI: change PCI nomenclature in drivers/pci/ (comment changes)
  PCI: fix section mismatch on update_res()
  PCI: add Intel 82599 Virtual Function specific reset method
  PCI: add Intel USB specific reset method
  PCI: support device-specific reset methods
  PCI: Handle case when no pci device can provide cache line size hint
  PCI/PM: Propagate wake-up enable for PCIe devices too
  vgaarbiter: fix a typo in the vgaarbiter Documentation