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