Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 00:29:55 +0000 (16:29 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 8 Feb 2006 00:29:55 +0000 (16:29 -0800)
commit92118c739df879497b8cc5a2eb3a9dc255f01b20
treeda556ca2f8afa1b43ca0626c9426f6634c64d32d
parentb4669d66fb1488fd9cebe0b8da447cfeb86109ba
parent276e0c75f1e9a8b34b7b19e8fe188be958d420dd
Merge /pub/scm/linux/kernel/git/gregkh/driver-2.6