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