Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 22:17:00 +0000 (15:17 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 22:17:00 +0000 (15:17 -0700)
commit41d0ab2a7dfe9e25504169c98eac5e84e5509e3d
treecb4e957b0c03494f4e0cc6a3f0f468e4b608dbf1
parenta4531edd75522804dd2b268d8ccc5eaa70748011
parentcdb9b9f730eac4f947a2c552806a3a550bf019ef
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6
include/linux/pci.h