linux/drivers/net/ethernet/intel/igb
David S. Miller 6e0895c2ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	drivers/net/ethernet/intel/igb/igb_main.c
	drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
	include/net/scm.h
	net/batman-adv/routing.c
	net/ipv4/tcp_input.c

The e{uid,gid} --> {uid,gid} credentials fix conflicted with the
cleanup in net-next to now pass cred structs around.

The be2net driver had a bug fix in 'net' that overlapped with the VLAN
interface changes by Patrick McHardy in net-next.

An IGB conflict existed because in 'net' the build_skb() support was
reverted, and in 'net-next' there was a comment style fix within that
code.

Several batman-adv conflicts were resolved by making sure that all
calls to batadv_is_my_mac() are changed to have a new bat_priv first
argument.

Eric Dumazet's TS ECR fix in TCP in 'net' conflicted with the F-RTO
rewrite in 'net-next', mostly overlapping changes.

Thanks to Stephen Rothwell and Antonio Quartulli for help with several
of these merge resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-22 20:32:51 -04:00
..
e1000_82575.c igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
e1000_82575.h igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
e1000_defines.h igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
e1000_hw.h igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
e1000_i210.c igb: Enable EEE LP advertisement 2013-04-18 16:40:28 -07:00
e1000_i210.h igb: Enable EEE LP advertisement 2013-04-18 16:40:28 -07:00
e1000_mac.c igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
e1000_mac.h igb: Fix code comments and whitespace 2013-04-18 16:40:25 -07:00
e1000_mbx.c igb: Fix code comments and whitespace 2013-04-18 16:40:25 -07:00
e1000_mbx.h igb: Fix code comments and whitespace 2013-04-18 16:40:25 -07:00
e1000_nvm.c igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
e1000_nvm.h igb: Copyright string update to year 2013 2013-01-19 05:05:05 -08:00
e1000_phy.c igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
e1000_phy.h igb: Copyright string update to year 2013 2013-01-19 05:05:05 -08:00
e1000_regs.h igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
igb_ethtool.c igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
igb_hwmon.c igb: Fix code comments and whitespace 2013-04-18 16:40:25 -07:00
igb_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-22 20:32:51 -04:00
igb_ptp.c igb: Add support for i354 devices 2013-04-18 16:40:35 -07:00
igb.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-04-22 20:32:51 -04:00
Makefile igb: Copyright string update to year 2013 2013-01-19 05:05:05 -08:00