Merge master.kernel.org:/home/rmk/linux-2.6-serial

Browse source

...

This commit is contained in:

Linus Torvalds 2006-01-18 15:19:40 -08:00

parent 2333f21207 d9004eb466

commit 2149bcabc5

3 changed files with 16 additions and 8 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

include/linux/pci_ids.h

View file