Zhoulu Luo bf45171730 Merge remote-tracking branch 'remotes/quic/jb_3.2' into HEAD ...

Conflicts:
	arch/arm/configs/msm8226-perf_defconfig
	arch/arm/configs/msm8226_defconfig
	arch/arm/mach-msm/clock-8974.c
	arch/arm/mach-msm/clock-local2.c
	arch/arm/mach-msm/clock-mdss-8974.c
	arch/arm/mach-msm/clock-mdss-8974.h
	drivers/gpu/msm/kgsl_device.h
	drivers/input/touchscreen/synaptics_i2c_rmi4.c
	drivers/media/platform/msm/vidc/msm_vidc.c
	drivers/media/platform/msm/vidc/venus_hfi.c
	drivers/media/platform/msm/vidc/vidc_hfi_io.h
	drivers/misc/qseecom.c
	drivers/thermal/msm_thermal.c
	drivers/video/msm/mdss/mdp3.c
	drivers/video/msm/mdss/mdp3.h
	drivers/video/msm/mdss/mdp3_ctrl.c
	drivers/video/msm/mdss/mdss_fb.c
	drivers/video/msm/mdss/mdss_mdp_overlay.c
	drivers/video/msm/mdss/mdss_mdp_pp.c
	sound/soc/codecs/msm_hdmi_codec_rx.c
	sound/soc/codecs/wcd9306.c
	sound/soc/codecs/wcd9xxx-resmgr.c
	sound/soc/msm/qdsp6v2/audio_acdb.c

Change-Id: Ibc13fd9186ff593bb11e9fa61bb03b10c22a3383

2013-12-12 13:01:47 -08:00

..

88pm860x_onkey.c

…

ab8500-ponkey.c

…

ad714x-i2c.c

…

ad714x-spi.c

…

ad714x.c

…

ad714x.h

…

adxl34x-i2c.c

…

adxl34x-spi.c

…

adxl34x.c

…

adxl34x.h

…

apanel.c

…

ati_remote2.c

…

atlas_btns.c

…

bfin_rotary.c

…

bma150.c

…

bmp18x-core.c

sensors: Add the class device support for bmp18x sensor

2013-12-08 20:28:25 -08:00

bmp18x-i2c.c

input:sensor: Add device tree and regulator control support for bmp18x

2013-07-10 14:11:57 -07:00

bmp18x.h

input:sensor: Add device tree and regulator control support for bmp18x

2013-07-10 14:11:57 -07:00

cm109.c

…

cm36283.c

Merge remote-tracking branch 'remotes/quic/jb_3.2' into HEAD

2013-12-12 13:01:47 -08:00

cma3000_d0x_i2c.c

…

cma3000_d0x.c

…

cma3000_d0x.h

…

cobalt_btns.c

…

da9052_onkey.c

…

dm355evm_keys.c

…

gp2ap002a00f.c

…

gpio_axis.c

…

gpio_event.c

…

gpio_input.c

…

gpio_matrix.c

…

gpio_output.c

…

gpio_tilt_polled.c

…

hp_sdc_rtc.c

…

isa1200-ff-memless.c

Update copyright to The Linux Foundation

2013-02-13 16:38:12 -08:00

ixp4xx-beeper.c

…

Kconfig

kconfig: add makefile and kconfig for cm36283

2013-09-05 21:43:44 -07:00

keychord.c

…

keyspan_remote.c

…

kxtj9.c

sensors: Add the class device support for kxtj9 sensor

2013-11-28 10:50:48 +08:00

lis3dh_acc.c

sensor: Use common device name for G-sensor device driver

2013-06-19 02:40:02 -07:00

m68kspkr.c

…

Makefile

kconfig: add makefile and kconfig for cm36283

2013-09-05 21:43:44 -07:00

max8925_onkey.c

…

max8997_haptic.c

…

mc13783-pwrbutton.c

…

mma8x5x.c

sensors: Add the class device support for mma8x5x sensor

2013-12-08 21:01:06 -08:00

mma8450.c

…

mpu3050.c

sensors: Add the class device support for mpu3050 sensor

2013-12-08 20:46:13 -08:00

pcap_keys.c

…

pcf8574_keypad.c

…

pcf50633-input.c

…

pcspkr.c

…

pm8xxx-vibrator.c

Update copyright to The Linux Foundation

2013-02-13 16:38:12 -08:00

pmic8xxx-pwrkey.c

input: pmic8xxx-pwrkey: Support sysfs interface for debounce

2012-10-08 17:53:47 +05:30

pmic8058-othc.c

Update copyright to The Linux Foundation

2013-02-13 16:38:12 -08:00

pmic8058-vib-memless.c

Update copyright to The Linux Foundation

2013-02-13 16:38:12 -08:00

powermate.c

…

pwm-beeper.c

…

rb532_button.c

…

rotary_encoder.c

…

sgi_btns.c

…

sparcspkr.c

…

stk3x1x.c

sensors: Add the class device support for stk3x1x sensor

2013-12-08 20:22:19 -08:00

twl4030-pwrbutton.c

…

twl4030-vibra.c

…

twl6040-vibra.c

…

uinput.c

…

wistron_btns.c

…

wm831x-on.c

…

xen-kbdfront.c

…

yealink.c

…

yealink.h

…