Linux 3.4.2

Conflicts:
	fs/ext4/mballoc.c
	fs/ext4/namei.c

Change-Id: I6be83db7c353560c966517cc8bc6e6e8d21caceb