Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorGreg KH <gregkh@suse.de>
Fri, 9 Sep 2005 21:26:01 +0000 (14:26 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 9 Sep 2005 21:26:01 +0000 (14:26 -0700)

Trivial merge