git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1d1652c 7cc31a9)

author	David S. Miller <davem@davemloft.net>
	Tue, 17 May 2011 21:33:11 +0000 (17:33 -0400)
committer	David S. Miller <davem@davemloft.net>
	Tue, 17 May 2011 21:33:11 +0000 (17:33 -0400)
commit	9cbc94eabb0791906051bbfac024ef2c2be8e079
tree	41ba194e687c6c60f5c883f98737ac83257d0c00	tree \| snapshot
parent	1d1652cbdb9885e4d73972263e4cdbe1b0beebfe	commit \| diff
parent	7cc31a9ae1477abc79d5992b3afe889f25c50c99	commit \| diff

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

Conflicts:
drivers/net/vmxnet3/vmxnet3_ethtool.c
net/core/dev.c

16 files changed:

drivers/net/bonding/bond_3ad.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/nic.c	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/nic.h	diff1 \|	diff2 \|	blob \| history
drivers/net/sfc/siena.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cmd.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_netfilter.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/ethtool.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.