Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit470cdf1e8b3e43830ec901ae2aec92b15aee0f30
authorRalf Baechle <ralf@linux-mips.org>
Wed, 7 Feb 2007 10:58:32 +0000 (7 10:58 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 7 Feb 2007 10:59:14 +0000 (7 10:59 +0000)
tree2b5b2b8797e7eb6be92afe20b592f8475aa2c281
parent84d16a7d54772eae204311fcce75c7fdaa86dd88
parent0670afdf0e69e5e73c8358da9c39bf3a8807b03e
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
Makefile
include/linux/pci_ids.h