]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Nov 2012 01:13:31 +0000 (12:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Nov 2012 01:13:31 +0000 (12:13 +1100)
commit6f2e227fef17c75b13daf8dc97c3e8cb9a726058
treecc0f5172e07f011abd4b19d96739a426df92185e
parent2dcbbe8f2684ce7109db642e77692fd1734c1573
parentd64ec841517a25f6d468bde9f67e5b4cffdc67c7
Merge remote-tracking branch 'net-next/master'
26 files changed:
MAINTAINERS
arch/arm/mach-at91/Kconfig
arch/cris/include/uapi/asm/socket.h
arch/m68k/include/uapi/asm/socket.h
arch/parisc/include/uapi/asm/socket.h
arch/xtensa/include/uapi/asm/socket.h
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
drivers/net/ethernet/qlogic/qla3xxx.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/ethernet/ti/Kconfig
drivers/net/usb/smsc95xx.c
drivers/net/usb/usbnet.c
drivers/net/vxlan.c
drivers/vhost/net.c
include/uapi/linux/usb/cdc.h
net/core/rtnetlink.c
net/core/skbuff.c
net/ipv4/inet_diag.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_minisocks.c
net/ipv4/tcp_timer.c
net/ipv6/route.c
net/sctp/socket.c