Second half of initial commit

Conflicts:
	arch/arm/kernel/process.c
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/acpuclock-krait.c
	arch/arm/mach-msm/board-8960-display.c
	arch/arm/mach-msm/board-8960-gpiomux.c
	arch/arm/mach-msm/board-8960-pmic.c
	arch/arm/mach-msm/board-8960-storage.c
	arch/arm/mach-msm/board-8960.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/clock-debug.c
	arch/arm/mach-msm/devices-8960.c
	arch/arm/mach-msm/devices.h
	arch/arm/mach-msm/include/mach/camera.h
	arch/arm/mach-msm/modem-8960.c
	arch/arm/mach-msm/msm_dsps.c
	arch/arm/mach-msm/pm-8x60.c
	arch/arm/mach-msm/restart.c
	arch/arm/mach-msm/socinfo.c
	arch/arm/tools/mach-types
	drivers/Makefile
	drivers/char/diag/diagfwd.c
	drivers/char/misc.c
	drivers/gpu/ion/ion_iommu_heap.c
	drivers/gpu/msm/adreno_ringbuffer.c
	drivers/gpu/msm/kgsl_pwrctrl.c
	drivers/hwmon/pm8xxx-adc-scale.c
	drivers/i2c/busses/i2c-qup.c
	drivers/input/misc/pmic8xxx-pwrkey.c
	drivers/input/touchscreen/Makefile
	drivers/leds/leds-pm8xxx.c
	drivers/media/platform/msm/camera_v1/Kconfig
	drivers/media/platform/msm/camera_v1/Makefile
	drivers/media/platform/msm/camera_v1/actuators/msm_actuator.c
	drivers/media/platform/msm/camera_v1/flash.c
	drivers/media/platform/msm/camera_v1/msm_gesture.c
	drivers/media/platform/msm/camera_v1/msm_mctl.c
	drivers/media/platform/msm/camera_v1/msm_vpe.c
	drivers/media/platform/msm/camera_v1/sensors/Makefile
	drivers/media/platform/msm/camera_v1/sensors/msm_sensor.h
	drivers/media/platform/msm/camera_v1/server/msm_cam_server.c
	drivers/media/platform/msm/camera_v2/sensor/io/msm_camera_qup_i2c.c
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/tsif.c
	drivers/mmc/core/mmc.c
	drivers/power/Makefile
	drivers/power/pm8921-charger.c
	drivers/staging/android/lowmemorykiller.c
	drivers/switch/Kconfig
	drivers/switch/Makefile
	drivers/usb/core/hub.c
	drivers/usb/gadget/android.c
	drivers/usb/otg/msm_otg.c
	drivers/video/msm/Kconfig
	drivers/video/msm/external_common.c
	drivers/video/msm/hdmi_msm.c
	drivers/video/msm/logo.c
	drivers/video/msm/mdp.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_video.c
	drivers/video/msm/mdp4_overlay_dtv.c
	drivers/video/msm/mdp4_overlay_lcdc.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi.h
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/msm_fb_panel.c
	drivers/video/msm/msm_fb_panel.h
	drivers/video/msm/vidc/1080p/resource_tracker/vcd_res_tracker.c
	include/linux/mfd/pm8xxx/pm8921-bms.h
	include/linux/mfd/pm8xxx/pm8921-charger.h
	include/linux/msm_mdp.h
	include/linux/usb/msm_hsusb.h
	include/media/msm_camera.h
	include/net/bluetooth/hci_core.h
	include/sound/q6asm.h
	net/bluetooth/hci_conn.c
	net/bluetooth/l2cap_core.c
	sound/soc/codecs/wcd9310.c
	sound/soc/msm/msm8960.c
	sound/soc/msm/qdsp6/q6asm.c