Linux 3.4.92

Signed-off-by: LaboDJ <jacopolabardi@gmail.com>

Conflicts:

	fs/ecryptfs/keystore.c