tree fbfd4e7453e4fd23dfef826d4610ed2aae47b36c
parent b6f4098897f30b7ea90a1c1edf35e9b20a9d828a
parent e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb
author David S. Miller <davem@davemloft.net> 1295906975 -0800
committer David S. Miller <davem@davemloft.net> 1295906975 -0800

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

Conflicts:
	net/sched/sch_hfsc.c
	net/sched/sch_htb.c
	net/sched/sch_tbf.c