From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Thu, 30 Jun 2005 16:04:36 +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=bd53d1270f51c6cfb53b06c8f93fd42327871d6b;p=linux-edison.git

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

bd53d1270f51c6cfb53b06c8f93fd42327871d6b