Merge branch 'master' into upstream
commitb5ed7639c9f502898af4109e778f5613dacbfd9c
authorJeff Garzik <jeff@garzik.org>
Wed, 14 Jun 2006 00:29:04 +0000 (13 20:29 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 14 Jun 2006 00:29:04 +0000 (13 20:29 -0400)
treeabe908c60ce1ea8f201028c9fc830cacd25c724b
parent0638dec01e89059c853515ab71c55fd13ba5a8ea
parenteb35cf60e462491249166182e3e755d3d5d91a28
Merge branch 'master' into upstream
drivers/pci/pci.c