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

diff --cc block/genhd.c
Simple merge

diff --cc fs/block_dev.c
Simple merge

diff --cc fs/super.c
Simple merge

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

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

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge