Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Fri, 2 Dec 2011 18:49:21 +0000 (13:49 -0500)]
21 files changed:
1  2 
MAINTAINERS
drivers/infiniband/core/addr.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/net/bonding/bond_main.c
drivers/net/ethernet/davicom/dm9000.c
drivers/net/ethernet/jme.c
drivers/net/wireless/ath/ath9k/hw.c
drivers/virtio/virtio_mmio.c
drivers/virtio/virtio_pci.c
include/linux/netdevice.h
include/linux/virtio_config.h
include/net/inetpeer.h
net/core/dev.c
net/ipv4/route.c
net/ipv4/udp.c
net/ipv6/ipv6_sockglue.c
net/ipv6/udp.c
net/mac80211/agg-tx.c
net/netlabel/netlabel_kapi.c
net/sched/sch_teql.c
net/wireless/nl80211.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
Simple merge
diff --cc net/ipv6/udp.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge