Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 26 Aug 2013 20:37:08 +0000 (16:37 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 26 Aug 2013 20:37:08 +0000 (16:37 -0400)
commitb05930f5d1c7d5873cb050261d21789a99de9d48
tree2d374846712b0bdacc5dd0a36b3c2f754886e560
parentb65f63ee845136940db985f3072335d8cdb6fd6c
parent41a00f7950a6bc0aa956f6d6b423f0fbf34d431a
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

Signed-off-by: David S. Miller <davem@davemloft.net>
17 files changed:
MAINTAINERS
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/macvtap.c
drivers/net/wireless/iwlwifi/dvm/mac80211.c
drivers/net/wireless/iwlwifi/pcie/rx.c
drivers/net/wireless/iwlwifi/pcie/trans.c
include/linux/ipv6.h
include/uapi/linux/ip.h
net/ipv4/tcp.c
net/ipv6/addrconf.c
net/ipv6/route.c
net/packet/af_packet.c
net/wireless/nl80211.c