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