Merge branch 'deprecated/android-4.9-q' of https://android.googlesource.com/kernel...

Change-Id: Ia96684a6c37a38a6e87d290ebfde978436e58c35

diff --cc Makefile
Simple merge

diff --cc block/partition-generic.c
Simple merge

diff --cc drivers/cpuidle/dt_idle_states.c
Simple merge

diff --cc drivers/gpu/drm/drm_connector.c
Simple merge

diff --cc drivers/mtd/mtdcore.c
Simple merge

diff --cc drivers/pinctrl/pinconf-generic.c
Simple merge

diff --cc fs/char_dev.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/ioctl.c
Simple merge

diff --cc fs/ext4/namei.c
Simple merge

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

diff --cc include/linux/fs.h
Simple merge

diff --cc kernel/gcov/gcc_4_7.c
Simple merge

diff --cc mm/memory.c
Simple merge