git.openwrt.org Git - openwrt/staging/blogic.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 2 Dec 2011 18:49:21 +0000 (13:49 -0500)
committer	David S. Miller <davem@davemloft.net>
	Fri, 2 Dec 2011 18:49:21 +0000 (13:49 -0500)
commit	b3613118eb30a589d971e4eccbbb2a1314f5dfd4
tree	868c1ee59e1b5c19a4f2e43716400d0001a994e5	tree \| snapshot
parent	7505afe28c16a8d386624930a018d0052c75d687	commit \| diff
parent	5983fe2b29df5885880d7fa3b91aca306c7564ef	commit \| diff

Merge git://git./linux/kernel/git/davem/net

21 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/addr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/davicom/dm9000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/jme.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/virtio/virtio_mmio.c	diff1 \|	diff2 \|	blob \| history
drivers/virtio/virtio_pci.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/virtio_config.h	diff1 \|	diff2 \|	blob \| history
include/net/inetpeer.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ipv6_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/netlabel/netlabel_kapi.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_teql.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/core/addr.c	diff1 \|	diff2 \|	blob \| history
drivers/infiniband/ulp/ipoib/ipoib_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/davicom/dm9000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/jme.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/virtio/virtio_mmio.c	diff1 \|	diff2 \|	blob \| history
drivers/virtio/virtio_pci.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/linux/virtio_config.h	diff1 \|	diff2 \|	blob \| history
include/net/inetpeer.h	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ipv6_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/netlabel/netlabel_kapi.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_teql.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history