From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Fri, 28 Oct 2005 20:09:47 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Tag: v2.6.15-rc1~732^2^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84860bf0644d7c45afe7ddbd30731c3e3c371fae;p=linux-2.6

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
---

84860bf0644d7c45afe7ddbd30731c3e3c371fae