]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Dec 2011 00:45:59 +0000 (11:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 2 Dec 2011 00:45:59 +0000 (11:45 +1100)
commitb20e9a21ebaccad27f6875cd3b646375bbe08741
treee56db02007191721d412c6a026e339fba7ff5903
parentc9a2801d6c3309cb737c14f0b65301e672681905
parentd984e6197ecd2babc1537f42dc1e676133005cda
Merge remote-tracking branch 'net-next/master'
26 files changed:
MAINTAINERS
drivers/infiniband/core/addr.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/net/bonding/bond_main.c
drivers/net/ethernet/Makefile
drivers/net/ethernet/davicom/dm9000.c
drivers/net/ethernet/jme.c
drivers/net/ethernet/micrel/ks8842.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/mac80211/main.c
net/mac80211/util.c
net/netlabel/netlabel_kapi.c
net/sched/sch_teql.c
net/wireless/nl80211.c
net/wireless/reg.c