From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 13 Dec 2005 05:42:17 +0000 (-0800)
Subject: Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7cd082f0147c5fc94b455bcc17fe21b22dbac703;p=linux.git

Merge branch 'upstream-fixes' of /linux/kernel/git/jgarzik/netdev-2.6
---

7cd082f0147c5fc94b455bcc17fe21b22dbac703