Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 22 Jul 2014 07:44:59 +0000 (00:44 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Jul 2014 07:44:59 +0000 (00:44 -0700)
commit8fd90bb889635fa1e7f80a3950948cc2e74c1446
tree1490343b5ad9f88b9333e53fa9457c00cbf6c2d1
parent1bb4238b17b5de6cdc120970a9d00dd8a44f40df
parent15ba2236f3556fc01b9ca91394465152b5ea74b6
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/infiniband/hw/cxgb4/device.c

The cxgb4 conflict was simply overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
MAINTAINERS
drivers/infiniband/hw/cxgb4/cm.c
drivers/infiniband/hw/cxgb4/device.c
drivers/infiniband/hw/cxgb4/iw_cxgb4.h
drivers/net/ethernet/realtek/r8169.c
drivers/net/ppp/ppp_generic.c
drivers/net/wan/x25_asy.c
drivers/net/xen-netback/netback.c
net/batman-adv/soft-interface.c
net/core/dev.c