diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-12-10 16:56:39 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-12-14 20:32:53 -0800 |
| commit | 387c9643f0e352b47267983730f0f8ea866ca9a3 (patch) | |
| tree | 1d2f9ad63896f38c6ce1fbc6b7168f7ea758de85 /drivers/mmc/card/block.c | |
| parent | 689cc2a66abbcb7884f3eb5074361d59ebddea37 (diff) | |
| parent | abacc500b7cddb62f7efc04d7c21d56375f42646 (diff) | |
Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android
Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/cputype.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/armv8_deprecated.c
arch/arm64/kernel/cpuinfo.c
Diffstat (limited to 'drivers/mmc/card/block.c')
0 files changed, 0 insertions, 0 deletions