]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 3 Feb 2009 08:15:35 +0000 (00:15 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Feb 2009 08:15:35 +0000 (00:15 -0800)
commitb3ff29d2ccfe3af065a9b393699a8fbf2abd1b15
tree99e5b423473097756353d038f922b2623f3edd2a
parent1bded710a574f20d41bc9e7fb531301db282d623
parentfb53fde9762432d091dac209bdf4f3f850117c55
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/Kconfig
14 files changed:
drivers/net/Kconfig
drivers/net/cassini.c
drivers/net/fec.c
drivers/net/igb/e1000_82575.c
drivers/net/igb/igb.h
drivers/net/igb/igb_main.c
drivers/net/ps3_gelic_wireless.c
drivers/net/qlge/qlge_main.c
drivers/net/smc911x.c
drivers/net/smsc9420.c
drivers/net/sungem.c
drivers/net/tsi108_eth.c
include/linux/pci_ids.h
include/linux/virtio_net.h