Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 23:00:33 +0000 (16:00 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 20 Jun 2005 23:00:33 +0000 (16:00 -0700)
commit1d345dac1f30af1cd9f3a1faa12f9f18f17f236e
tree42a7deda7589edf704fe60dc262046755bd3f6a8
parentfb395884576684ebb54b19b1054f4caed589d5f0
parent87c8a4433b608261a9becdb0ce2d2f2ed4b71d05
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6