]> git.ipfire.org Git - thirdparty/iproute2.git/commit
Merge branch 'choke' into net-next
authorStephen Hemminger <stephen.hemminger@vyatta.com>
Fri, 25 Feb 2011 20:35:01 +0000 (12:35 -0800)
committerStephen Hemminger <stephen.hemminger@vyatta.com>
Fri, 25 Feb 2011 20:35:01 +0000 (12:35 -0800)
commitdd4b25a0f9d696e29a12f6c25a87aace36ce6a15
tree66dcf0e97f40443ffea02a12d0106eb765ee3ae1
parent08dc32e13065a182551f3e034db8ad6ad3390c62
parent1551198b40d0ea8abd9dc3072386dc78d05b6bbc
Merge branch 'choke' into net-next

Conflicts:
include/linux/pkt_sched.h