Merge branch 'reiser4-3.12' into reiser4-3.13

Conflicts:
	fs/fs-writeback.c
	include/linux/migrate.h