Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 02:13:32 +0000 (18:13 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 1 Feb 2006 02:13:32 +0000 (18:13 -0800)
commitef59c4e935feb966900a8321e75f74d7df2a2f16
tree8bdd8e837554b268b600b57187612b9ac4a5d5f5
parent69396dcfa3c50a6b8d2caaccf5d1496ecd5594be
parent3103039cc2a8dc6ababc29afac5c3cadbfa69af9
Merge /pub/scm/linux/kernel/git/gregkh/pci-2.6