e7: arch/arm/boot

Conflicts:
	arch/arm/boot/dts/msm8974-camera.dtsi
	arch/arm/boot/dts/msm8974-leds.dtsi
	arch/arm/boot/dts/msm8974-mtp.dtsi
	arch/arm/boot/dts/msm8974.dtsi
	arch/arm/boot/dts/msmsamarium-rumi.dts

Change-Id: Ie9b1364ce7c69305b14063bc50b26010c1571f24
e7: update defconfig
e7: update defconfig

Change-Id: I09d5c2aac13c8e9697822351504a00c30e612073
e7: arch/arm/kernel/setup.c

Change-Id: Iafe330b21da5d14134ac476698e5c41f1ba78cad
e7: arch/arm/mach-msm/include/mach/

Change-Id: I60d46b8529670e2379b6f94d1f35aad562d8f24d
e7: arch/arm/mach-msm/cpufreq.c

Change-Id: I120408a0ccd22f84a954e9e9c31a9091aa90954d
e7: hotplug disbled

Change-Id: Ia9f8b8601b8c253dbe84e777bd8686f8a0ee587d
arch/arm/mach-msm/

Change-Id: Ib5d7d70d9b6651cda3f4ed2255bd6d1cf17c5cbe
e7: drivers/char/diag/diagfwd.c

Change-Id: I83acdb1b09bc4205a0d0142821dbddb591c1da35
e7: drivers/cpufreq/cpufreq.c

Change-Id: Id4066ab3d0aac2605d1f412477b4c76a2ddc7157
e7: drivers/hwmon/qpnp-adc-common.c

Change-Id: I09167affb2d621a3527777d8e3bc8318336a53fd
e7: drivers/input/touchscreen/

Change-Id: I43e8b7733a635ed6694180c85d3d54382d489e9a
e7: drivers/leds

Change-Id: Ic5f02194b91d14277f520100a4011c2b1a30ca39
e7: drivers/media/platform/msm/camera_v2/msm_buf_mgr

Change-Id: Ie8bf87e3dddde43029edb42d4145d96d90171f99
e7: drivers/media/platform/msm/camera_v2/msm_vb2/msm_vb2.c

Change-Id: I314095ed3fda9d42c7d0e3697682ba0c676f704c
e7: drivers/media/platform/msm/camera_v2/pproc/cpp/msm_cpp.c

Change-Id: Ib3abfc6338478646cbdcc14b2ca5bcc6b3622f77
e7: drivers/media/platform/msm/camera_v2/sensor

Change-Id: Iaf7194b4f84e58729dedeb2434d0a04a81d14762
e7: drivers/media/platform/msm/camera_v2/sensor/eeprom/msm_eeprom.c

Change-Id: I21625b9ff5b554f525fb6e7a75c6332f42881189
e7: drivers/media/platform/msm/camera_v2/sensor

Change-Id: I08e9eca9051297130a252ac72498310ee94ea376
e7: drivers/media/platform/msm

Change-Id: Ie8810f666d7002c8dac17378e2a3eeb9a982e332