From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Mon, 20 Jun 2005 23:00:33 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=1d345dac1f30af1cd9f3a1faa12f9f18f17f236e;p=linux-edison.git

Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6
---

1d345dac1f30af1cd9f3a1faa12f9f18f17f236e