]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:13:21 +0000 (13:13 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 20 Feb 2013 02:13:21 +0000 (13:13 +1100)
commit5309df50dc45b907f00bc2514beb03f654c3374f
treee0c2fddb358c7dfd7e5407fddf294c7067c58029
parent18868dc6f776372cb0742e5d36436bb8220daaa5
parent303c07db487be59ae9fda10600ea65ca11c21497
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/mips/include/uapi/asm/socket.h
crypto/ctr.c
MAINTAINERS
arch/mips/include/uapi/asm/socket.h
crypto/ctr.c
drivers/net/ethernet/freescale/fec_mpc52xx.c
drivers/s390/net/qeth_core.h
net/ipv4/tcp.c