From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 25 May 2005 21:01:50 +0000 (-0700)
Subject: Merge of 'for-linus' branch from
X-Git-Tag: v2.6.12-rc6~160
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b981021e88c8c28dc6a22cb1a327d8dc9296473;p=linux-2.6

Merge of 'for-linus' branch from

	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
---

1b981021e88c8c28dc6a22cb1a327d8dc9296473