Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git