Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Thu, 2 Jun 2016 04:18:57 +0000 (12:18 +0800)
committerAlex Shi <alex.shi@linaro.org>
Thu, 2 Jun 2016 04:18:57 +0000 (12:18 +0800)
1  2 
drivers/mmc/card/block.c
drivers/mmc/core/core.c

Simple merge
Simple merge