]> 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, 13 Dec 2013 00:24:54 +0000 (11:24 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 13 Dec 2013 00:24:54 +0000 (11:24 +1100)
commitec98681b663847bf989ce002a8088a46a0bd17c5
tree0b3755104478d3e5869a85e7e031405fed9f5691
parent89790150624e3e3d3332ea51944381e6b6ca22ae
parent68536053600425c24aba031c45f053d447eedd9c
Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/macvtap.c
27 files changed:
MAINTAINERS
drivers/net/ethernet/8390/hydra.c
drivers/net/ethernet/8390/zorro8390.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/freescale/fec_main.c
drivers/net/ethernet/sfc/efx.c
drivers/net/ethernet/sfc/nic.h
drivers/net/ethernet/sfc/ptp.c
drivers/net/ethernet/smsc/smc91x.c
drivers/net/ethernet/ti/cpsw.c
drivers/net/macvtap.c
drivers/net/tun.c
drivers/net/vxlan.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/xen-netback/netback.c
include/linux/netdevice.h
include/net/sctp/structs.h
net/ipv6/route.c
net/ipv6/tcp_ipv6.c
net/sched/sch_htb.c
net/sctp/associola.c
net/sctp/output.c
net/sctp/sm_statefuns.c
net/sctp/socket.c
net/sctp/sysctl.c
net/tipc/core.c
net/unix/af_unix.c