]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 06:29:09 +0000 (16:29 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 24 Aug 2012 06:29:09 +0000 (16:29 +1000)
commiteaa4ae7c39072fbfcd79678a5a93879047ee15fe
treeff237f0547cf8037645debd42a2b3102cb261604
parent0f4fb23c32c98d736fb9a2f4907052a51df9fa8b
parent898132ae76d1aeb52301f10e8795c34fbb54e853
Merge remote-tracking branch 'userns/for-next'
16 files changed:
drivers/net/tun.c
fs/namei.c
include/net/ipv6.h
include/net/sock.h
include/net/tcp.h
init/Kconfig
net/core/dev.c
net/core/scm.c
net/core/sock.c
net/ipv4/tcp_ipv4.c
net/ipv4/udp.c
net/ipv6/tcp_ipv6.c
net/key/af_key.c
net/netlink/af_netlink.c
net/packet/af_packet.c
net/sctp/proc.c