git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit

author	David S. Miller <davem@davemloft.net>
	Tue, 12 Feb 2013 23:58:28 +0000 (18:58 -0500)
committer	David S. Miller <davem@davemloft.net>
	Tue, 12 Feb 2013 23:58:28 +0000 (18:58 -0500)
commit	9f6d98c298d48eec29a32ae8ed6f4d896eb4f634
tree	24a21ecbd80cd737ce0a4a21591340e6d7f51964	tree \| snapshot
parent	db98f081888cbdd995c7c4cfd407781da35e33ba	commit \| diff
parent	9c10f4115cc3722635d6e277385ec96003281784	commit \| diff

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

The bnx2x gso_type setting bug fix in 'net' conflicted with
changes in 'net-next' that broke the gso_* setting logic
out into a seperate function, which also fixes the bug in
question. Thus, use the 'net-next' version.

Signed-off-by: David S. Miller <davem@davemloft.net>

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

RSS Atom

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/realtek/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history