]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'userns/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 06:45:52 +0000 (16:45 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 20 Aug 2012 06:45:52 +0000 (16:45 +1000)
commit7b39903e495b35a5659fc91d9acbf1c8f61d9a01
tree0b5a6a510c0488824785122bf42f95294e05fd26
parentcb6e6c64412347c06a569acf33746af83ce9a0c4
parent898132ae76d1aeb52301f10e8795c34fbb54e853
Merge remote-tracking branch 'userns/for-next'
15 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/packet/af_packet.c
net/sctp/proc.c