Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/arm64/kernel/head.S
Simple merge

diff --cc drivers/md/dm-crypt.c
Simple merge

diff --cc drivers/mmc/card/block.c
Simple merge

diff --cc drivers/mmc/card/queue.h
Simple merge

diff --cc fs/pstore/ram.c
Simple merge

diff --cc fs/pstore/ram_core.c
Simple merge

diff --cc fs/super.c
Simple merge