Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

author David S. Miller <davem@davemloft.net>

Mon, 20 Dec 2010 21:24:14 +0000 (13:24 -0800)

committer David S. Miller <davem@davemloft.net>

Mon, 20 Dec 2010 21:24:14 +0000 (13:24 -0800)
author David S. Miller <davem@davemloft.net>
Mon, 20 Dec 2010 21:24:14 +0000 (13:24 -0800)
committer David S. Miller <davem@davemloft.net>
Mon, 20 Dec 2010 21:24:14 +0000 (13:24 -0800)
diff --cc include/net/ip6_route.h
Simple merge
diff --cc include/net/sch_generic.h
Simple merge
diff --cc net/sched/sch_sfq.c
Simple merge
author	David S. Miller <davem@davemloft.net>
	Mon, 20 Dec 2010 21:24:14 +0000 (13:24 -0800)
committer	David S. Miller <davem@davemloft.net>
	Mon, 20 Dec 2010 21:24:14 +0000 (13:24 -0800)
		1	2
include/net/ip6_route.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/net/sch_generic.h	patch \|	diff1 \|	diff2 \|	blob \| history
net/sched/sch_sfq.c	patch \|	diff1 \|	diff2 \|	blob \| history