Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit987123fe3333108a14fddf239c0b65c2e3fcd821
authorRalf Baechle <ralf@linux-mips.org>
Thu, 8 Feb 2007 11:12:08 +0000 (8 11:12 +0000)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 8 Feb 2007 11:15:13 +0000 (8 11:15 +0000)
treeb287a8063fc8e3563ee038033ee8e4d4b20c0ac4
parente3801662c665be027b1a90dd19c2df7f2ccb7344
parentc4184f117af7441fb83bc413d2214d92920e0289
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6
drivers/net/Kconfig
drivers/net/Makefile
include/linux/pci_ids.h