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