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)
1  2 
drivers/pci/quirks.c

Simple merge