Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Mon, 4 Sep 2006 10:41:37 +0000 (06:41 -0400)
committerJeff Garzik <jeff@garzik.org>
Mon, 4 Sep 2006 10:41:37 +0000 (06:41 -0400)
commitf9bcda7760e1373615c9f6d9ce24209b0ab97de1
treef90b3031126c4e4beb8161f38ea436303e2b8b73
parent9bec2e38527a9f2497b3d976715c672d08d6160d
parentc336923b668fdcf0312efbec3b44895d713f4d81
Merge branch 'master' into upstream
drivers/pci/quirks.c