Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:44:22 +0000 (10:44 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 7 Jan 2006 18:44:22 +0000 (10:44 -0800)
1  2 
include/linux/pci_ids.h

Simple merge