David S. Miller 7e52b33bd5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/ipv6/route.c This deals with a merge conflict between the net-next addition of the inetpeer network namespace ops, and Thomas Graf's bug fix in 2a0c451ade which makes sure we don't register /proc/net/ipv6_route before it is actually safe to do so. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-15 15:51:55 -07:00
..
af_can.c	can: update documentation wording error frames -> error messages	2012-05-23 22:55:49 +02:00
af_can.h	can: remove references to berlios mailinglist	2011-10-17 19:22:46 -04:00
bcm.c	can: remove references to berlios mailinglist	2011-10-17 19:22:46 -04:00
gw.c	can: fix sparse warning for cgw_list	2012-04-16 21:08:18 +02:00
Kconfig	can-gw: add netlink based CAN routing	2011-09-16 17:37:51 -04:00
Makefile	can-gw: add netlink based CAN routing	2011-09-16 17:37:51 -04:00
proc.c	can: remove references to berlios mailinglist	2011-10-17 19:22:46 -04:00
raw.c	net: remove skb_orphan_try()	2012-06-15 15:30:15 -07:00