Merge remote-tracking branch 'v3.18/topic/dm-crypt' into linux-linaro-lsk-v3.18