add huawei changes - thanks dazzozo

Conflicts:

	arch/arm/kernel/process.c
	arch/arm/mach-msm/Kconfig
	arch/arm/mach-msm/Makefile
	arch/arm/mach-msm/acpuclock-7627.c
	arch/arm/mach-msm/audio-7627a-devices.c
	arch/arm/mach-msm/board-msm7627a-camera.c
	arch/arm/mach-msm/board-msm7627a-wlan.c
	arch/arm/mach-msm/board-msm7x27a.c
	arch/arm/mach-msm/devices-msm7x27a.c
	arch/arm/mach-msm/include/mach/board.h
	arch/arm/mach-msm/include/mach/qdsp5v2/audio_acdb_def.h
	arch/arm/mach-msm/include/mach/qdsp5v2/marimba_profile.h
	arch/arm/mach-msm/msm_cpr.c
	arch/arm/mach-msm/qdsp5/audio_mvs.c
	arch/arm/mach-msm/qdsp5/audio_voicememo.c
	arch/arm/mach-msm/qdsp5v2/Makefile
	arch/arm/mach-msm/qdsp5v2/audio_acdb.c
	arch/arm/mach-msm/qdsp5v2/snddev_data_marimba.c
	arch/arm/mach-msm/qdsp5v2/snddev_data_timpani.c
	arch/arm/mach-msm/qdsp5v2/timpani_profile_7x30.h
	arch/arm/mach-msm/sdio_al_dloader.c
	arch/arm/mach-msm/socinfo.c
	arch/arm/tools/mach-types
	drivers/Makefile
	drivers/char/diag/Makefile
	drivers/char/diag/diagchar_core.c
	drivers/char/diag/diagfwd.c
	drivers/char/msm_rotator.c
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/gpu/msm/adreno_a2xx.c
	drivers/gpu/msm/adreno_postmortem.c
	drivers/input/misc/Kconfig
	drivers/input/misc/Makefile
	drivers/input/touchscreen/Kconfig
	drivers/input/touchscreen/Makefile
	drivers/media/radio/radio-tavarua.c
	drivers/media/video/msm/Makefile
	drivers/media/video/msm/actuators/msm_actuator.c
	drivers/media/video/msm/flash.c
	drivers/media/video/msm/io/msm_camera_io_util.c
	drivers/media/video/msm/msm.c
	drivers/media/video/msm/msm_camera.c
	drivers/media/video/msm/msm_mctl.c
	drivers/media/video/msm/mt9d113.c
	drivers/media/video/msm/mt9d113.h
	drivers/media/video/msm/mt9d113_reg.c
	drivers/media/video/msm/sensors/Makefile
	drivers/media/video/msm/sensors/msm_sensor.c
	drivers/media/video/msm/sensors/msm_sensor.h
	drivers/media/video/msm/sensors/mt9e013_v4l2.c
	drivers/media/video/msm/sensors/ov5647_v4l2.c
	drivers/media/video/msm/sensors/s5k4e1_v4l2.c
	drivers/misc/Makefile
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/mmc.c
	drivers/mmc/host/msm_sdcc.c
	drivers/power/msm_battery.c
	drivers/rtc/Kconfig
	drivers/staging/Makefile
	drivers/tty/serial/msm_serial_hs.c
	drivers/usb/gadget/android.c
	drivers/usb/gadget/f_rndis.c
	drivers/video/msm/mdp4.h
	drivers/video/msm/mdp4_overlay.c
	drivers/video/msm/mdp4_overlay_dsi_cmd.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/mdp_dma_lcdc.c
	drivers/video/msm/mipi_dsi.c
	drivers/video/msm/mipi_dsi_host.c
	drivers/video/msm/msm_fb.c
	drivers/video/msm/tvout_msm.c
	include/linux/mmc/card.h
	include/linux/msm_mdp.h
	include/linux/msm_rmnet.h
	include/linux/msm_rotator.h
	include/media/msm_camera.h
	include/net/bluetooth/amp.h
	include/net/bluetooth/bluetooth.h
	include/net/bluetooth/hci.h
	include/net/bluetooth/hci_core.h
	include/net/bluetooth/l2cap.h
	include/net/cfg80211.h
	kernel/power/wakelock.c
	kernel/sys.c
	net/bluetooth/amp.c
	net/bluetooth/hci_conn.c
	net/bluetooth/hci_core.c
	net/bluetooth/hci_event.c
	net/bluetooth/l2cap_core.c
	net/bluetooth/l2cap_sock.c
	net/bluetooth/mgmt.c
	net/bluetooth/smp.c
	net/core/sock_diag.c
	net/wireless/nl80211.c