git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1bded71 fb53fde)

author	David S. Miller <davem@davemloft.net>
	Tue, 3 Feb 2009 08:15:35 +0000 (00:15 -0800)
committer	David S. Miller <davem@davemloft.net>
	Tue, 3 Feb 2009 08:15:35 +0000 (00:15 -0800)
commit	b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15
tree	99e5b423473097756353d038f922b2623f3edd2a	tree \| snapshot (tar.gz zip)
parent	1bded710a574f20d41bc9e7fb531301db282d623	commit \| diff
parent	fb53fde9762432d091dac209bdf4f3f850117c55	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/Kconfig

14 files changed:

drivers/net/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/cassini.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fec.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/e1000_82575.c	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb.h	diff1 \|	diff2 \|	blob \| history
drivers/net/igb/igb_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ps3_gelic_wireless.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smc911x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/smsc9420.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sungem.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tsi108_eth.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/linux/virtio_net.h	diff1 \|	diff2 \|	blob \| history

Motorola kernel-slsi