Merge branch 'for-4.1/drivers' of git://git.kernel.dk/linux-block