Merge remote-tracking branch 'block/for-next'

diff --cc Makefile
Simple merge

diff --cc drivers/mmc/core/block.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

diff --cc fs/aio.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

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

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

diff --cc init/do_mounts_initrd.c
Simple merge

diff --cc kernel/cgroup/cgroup.c
Simple merge