Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:55:23 +0000 (15:55 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 8 Sep 2005 22:55:23 +0000 (15:55 -0700)
commit7bbedd521310547ca73cc77adcf61fb85723adc3
treef759d90c46bfbc48a9f396c9c6f839da11cdc6aa
parentf44702f49056c203341badaa2cb8a706160d9119
parenta04ce0ffcaf561994ecf382cd3caad75556dc499
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6