]> err.no Git - linux-2.6/commitdiff
Merge branch 'master'
authorJeff Garzik <jeff@garzik.org>
Sat, 15 Apr 2006 00:48:55 +0000 (20:48 -0400)
committerJeff Garzik <jeff@garzik.org>
Sat, 15 Apr 2006 00:48:55 +0000 (20:48 -0400)
1  2 
include/linux/pci_ids.h

Simple merge