From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sat, 4 Jun 2005 15:18:39 +0000 (-0700)
Subject: Automatic merge of 'misc-fixes' branch from
X-Git-Tag: v2.6.12-rc6~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d3045064054a93d303094cfb96d980cc3c82a64c;p=linux-2.6-omap-h63xx.git

Automatic merge of 'misc-fixes' branch from

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

d3045064054a93d303094cfb96d980cc3c82a64c