Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Mon, 20 Dec 2010 21:24:14 +0000 (13:24 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 Dec 2010 21:24:14 +0000 (13:24 -0800)
commitd9993be65a77f500ae926176baa264816bfe3816
treebbb8c86114bf86e5ca3d1fbf89de3d98be5519ba
parentc4266263249f22479eb1abb1a1709c38240b1597
parentaa3e219997e4b949be4199660936099ded0b401f
Merge branch 'master' of /linux/kernel/git/davem/net-2.6
include/net/ip6_route.h
include/net/sch_generic.h
net/sched/sch_sfq.c