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