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)
commitcc918c7ab7da017bfaf9661420bb5c462e057cfb
tree36198fe17267200131ec6c3df7c046a857f76b8d
parentf9c5d0451b406a6bd0d0bf1fdd63c7777af6ebc6
parentdd68e88c72ac9ad25052065c4a443326eda6a052
Merge master.kernel.org:/home/rmk/linux-2.6-serial
include/linux/pci_ids.h