From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sun, 28 Aug 2005 01:05:14 +0000 (-0700)
Subject: Merge refs/heads/upstream-fixes from master.kernel.org:/pub/scm/linux/kernel/git... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3d52acb34247816c453f94596e6c7fc4499b76dc;p=deliverable%2Flinux.git

Merge refs/heads/upstream-fixes from /linux/kernel/git/jgarzik/netdev-2.6
---

3d52acb34247816c453f94596e6c7fc4499b76dc