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