]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 00:38:20 +0000 (11:38 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Nov 2012 00:38:20 +0000 (11:38 +1100)
commitba80d2f73d8312a67c3f90edaa8e321820403d72
treef269594cbea4481c5605daeaf761a318b6cd17d1
parente731837a19a2631a7fb666af6e79f20300809d10
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