]> err.no Git - linux-2.6/commitdiff
Merge branch 'master' into upstream
authorJeff Garzik <jeff@garzik.org>
Wed, 14 Jun 2006 00:29:04 +0000 (20:29 -0400)
committerJeff Garzik <jeff@garzik.org>
Wed, 14 Jun 2006 00:29:04 +0000 (20:29 -0400)
1  2 
drivers/pci/pci.c

Simple merge