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