Merge tag 'v3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Conflicts:
	fs/gfs2/Kconfig