git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

author	Andi Kleen <ak@linux.intel.com>
	Fri, 5 Oct 2012 00:12:11 +0000 (17:12 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Fri, 5 Oct 2012 18:04:45 +0000 (03:04 +0900)
commit	04a6f82cf01aeef9fb058b2fca0ef1fe0a09c2fa
tree	d9fb34c24277a6eec6f5da9aeff450aedb8e387c	tree \| snapshot
parent	6299b669b1340b9f7de2bc2bd565921a1494e7f7	commit \| diff

sections: fix section conflicts in net

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: David Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

John Crispins staging tree

RSS Atom

include/net/net_namespace.h		diff \| blob \| history
net/decnet/dn_rules.c		diff \| blob \| history
net/ipv4/fib_rules.c		diff \| blob \| history
net/ipv4/ipmr.c		diff \| blob \| history
net/ipv6/addrlabel.c		diff \| blob \| history
net/ipv6/fib6_rules.c		diff \| blob \| history
net/ipv6/ip6mr.c		diff \| blob \| history