Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit2f8dac46c001c28efcf7e0f705c10f5e0cd90f25
authorRalf Baechle <ralf@linux-mips.org>
Tue, 7 Mar 2006 11:33:13 +0000 (7 11:33 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 7 Mar 2006 11:33:13 +0000 (7 11:33 +0000)
treef2c4d9e85d7cc652bc9477b4e6224eec2213fdd5
parente8a3ac271b28a5648d5401adbff7cff8529ceedf
parentd11d9b2dd2c43dd99a491df8a83ae28401db0044
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
include/linux/pci_ids.h