From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 17 Feb 2006 13:15:41 +0000 (-0500)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Tag: v2.6.17-rc1~1186^2~51^2~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=750b50ab5687125d8a1dc946d931b00acf016e2c;p=linux-2.6

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
---

750b50ab5687125d8a1dc946d931b00acf016e2c