summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-09-14 09:35:34 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-14 09:35:34 -0700
commit186051d70444742bf1c2bc0257dd4696a3df66e3 (patch)
tree0c54ee48fa3c9a47cdb82fc29f8632c376790c8a /drivers/pci
parent668e4bc7229c1866f65f3bef6ab011f8c9034089 (diff)
parente172577da02cde3916e75406b314e6f01c228a5c (diff)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/pci')
0 files changed, 0 insertions, 0 deletions