Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 21:35:05 +0000 (13:35 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 17 Dec 2007 21:35:05 +0000 (13:35 -0800)
commit13ef7b69b54aa8ae4ed264d0bf41339737f8543a
treeee8e2e0081c094ebabd03f46db399dddb08b2a19
parent87d5df6bde5764f1f6c18fe32f80e83f5010fa8c
parentbb44609361fe87c5e136c2b8dfde59bcbdbabf61
Merge git://git./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