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-Url: http://rtime.felk.cvut.cz/gitweb/lisovros/iproute2_canprio.git/commitdiff_plain/dd4b25a0f9d696e29a12f6c25a87aace36ce6a15

Merge branch 'choke' into net-next

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

dd4b25a0f9d696e29a12f6c25a87aace36ce6a15