Merge branch 'v3.10/topic/dm-crypt' into linux-linaro-lsk-v3.10
authorAlex Shi <alex.shi@linaro.org>
Tue, 23 Jun 2015 09:39:52 +0000 (17:39 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 23 Jun 2015 09:39:52 +0000 (17:39 +0800)

Trivial merge