projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 255e876 898132a)
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...
authorDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 22:54:37 +0000 (18:54 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 24 Aug 2012 22:54:37 +0000 (18:54 -0400)
commite6acb384807406c1a6ad3ddc91191f7658e63b7a
tree7906d1bb402ac30e4efaa1bc6451b1c7a4b6e768tree | snapshot
parent255e87657a84e21986e5d9070f3dee4aa8d1d531commit | diff
parent898132ae76d1aeb52301f10e8795c34fbb54e853commit | diff
Merge branch 'for-next' of git://git./linux/kernel/git/ebiederm/user-namespace

This is an initial merge in of Eric Biederman's work to start adding
user namespace support to the networking.

Signed-off-by: David S. Miller <davem@davemloft.net>
15 files changed:
drivers/net/tun.c diff1 | diff2 | blob | history
fs/namei.c diff1 | diff2 | blob | history
include/net/ipv6.h diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
include/net/tcp.h diff1 | diff2 | blob | history
net/core/dev.c diff1 | diff2 | blob | history
net/core/scm.c diff1 | diff2 | blob | history
net/core/sock.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/tcp_ipv6.c diff1 | diff2 | blob | history
net/key/af_key.c diff1 | diff2 | blob | history
net/netlink/af_netlink.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
net/sctp/proc.c diff1 | diff2 | blob | history
John Crispins staging tree