Linux 3.4.2

Change-Id: I4974751213bc87ccf01bc0a244919ad310cde44e
Signed-off-by: Willi Ye <williye97@gmail.com>

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