Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 1 Jun 2005 14:55:46 +0000 (07:55 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 1 Jun 2005 14:55:46 +0000 (07:55 -0700)
commitc10fccddf00cb216349ce3171ce2e39d7c70371b
tree039bdc3d2c19ce93c5bde2a5acf0c26e2de80272
parent5f64f73957f6cae3222f97f2599199ee562f7f3f
parentbcc488ab02254a6e60d749187a632dc3d642d4f8
Merge ... /pub/scm/linux/kernel/git/gregkh/pci-2.6