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