tree ee8e2e0081c094ebabd03f46db399dddb08b2a19
parent 87d5df6bde5764f1f6c18fe32f80e83f5010fa8c
parent bb44609361fe87c5e136c2b8dfde59bcbdbabf61
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1197927305 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1197927305 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: Restore PCI expansion ROM P2P prefetch window creation