From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 17 May 2005 03:06:47 +0000 (-0700)
Subject: Automatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d3f0fcec2d50a18a84c4f3dd7683206ed37ca009;p=linux.git

Merge ... /linux/kernel/git/jgarzik/netdev-2.6.git
---

d3f0fcec2d50a18a84c4f3dd7683206ed37ca009