]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'net-next/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 01:41:50 +0000 (12:41 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 16 Jan 2014 01:41:50 +0000 (12:41 +1100)
commit39b12d6cb96b6c6f42b9e1c400bd60ce37ce553f
treee81d108e9593fef2c0059ddf4d3bef2df1faaf0b
parent1958f05c0841799b09215036c1c2aba69d2c88d1
parent42851e88a7556e525a5527d46c3763830d8fdd2e
Merge remote-tracking branch 'net-next/master'

Conflicts:
arch/mips/bcm47xx/setup.c
arch/um/include/asm/Kbuild
14 files changed:
MAINTAINERS
arch/arm64/include/asm/Kbuild
arch/mips/bcm47xx/setup.c
arch/um/include/asm/Kbuild
arch/xtensa/include/asm/Kbuild
drivers/net/can/mscan/mpc5xxx_can.c
drivers/net/ethernet/8390/hydra.c
drivers/net/ethernet/8390/zorro8390.c
drivers/net/ethernet/ibm/ibmveth.c
include/uapi/linux/pci_regs.h
net/ipv4/ipmr.c
net/sunrpc/cache.c
net/sunrpc/xprt.c
net/sunrpc/xprtsock.c