Merge branch 'v3.10/topic/dm-crypt' into linux-linaro-lsk-v3.10