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
..
2013-02-27 22:51:08 -05:00
2013-03-17 12:16:38 -04:00
2013-01-10 00:51:54 +01:00
2013-04-07 18:58:55 -04:00
2012-08-09 16:18:06 -07:00
2013-03-06 16:36:11 +01:00
2012-04-15 12:44:40 -04:00
2012-04-15 12:44:40 -04:00
2012-07-19 10:43:03 -07:00
2012-10-08 17:42:36 -04:00
2013-03-26 12:27:18 -04:00
2013-01-27 22:46:33 -05:00
2013-02-21 18:15:58 -05:00
2013-03-26 12:27:18 -04:00
2013-03-26 12:27:18 -04:00
2013-04-02 00:23:58 +02:00
2012-05-17 18:45:20 -04:00
2012-05-19 01:08:16 -04:00
2012-11-03 14:59:04 -04:00
2012-08-06 13:40:47 -07:00
2013-04-14 15:41:49 -04:00
2013-04-12 18:17:06 -04:00
2012-04-15 12:44:40 -04:00
2012-05-16 15:17:08 -04:00
2012-04-15 12:44:40 -04:00