linux/net/802
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
..
fc.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
fddi.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
garp.c 802: fix a possible race condition 2013-04-07 17:04:17 -04:00
hippi.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
Kconfig net/802: Implement Multiple Registration Protocol (MRP) 2013-02-10 20:37:22 -05:00
Makefile net/802: Implement Multiple Registration Protocol (MRP) 2013-02-10 20:37:22 -05:00
mrp.c net/802/mrp: fix possible race condition when calling mrp_pdu_queue() 2013-04-12 15:10:48 -04:00
p8022.c net: delete all instances of special processing for token ring 2012-05-15 20:14:35 -04:00
p8023.c
psnap.c
stp.c 802: Convert compare_ether_addr to ether_addr_equal 2012-05-09 20:49:17 -04:00