From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 25 Feb 2011 20:35:01 +0000 (-0800)
Subject: Merge branch 'choke' into net-next
X-Git-Tag: v2.6.39~13^2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd4b25a0f9d696e29a12f6c25a87aace36ce6a15;p=thirdparty%2Fiproute2.git

Merge branch 'choke' into net-next

Conflicts:
	include/linux/pkt_sched.h
---

dd4b25a0f9d696e29a12f6c25a87aace36ce6a15