Merge branch 'for-3.2/core' into for-next

Conflicts:
	block/blk-core.c
	include/linux/blkdev.h

diff --cc block/blk-core.c
Simple merge

diff --cc block/blk-sysfs.c
Simple merge

diff --cc drivers/block/loop.c
Simple merge

diff --cc include/linux/blkdev.h
Simple merge