Huang, Tao bbf44583ac Merge branch 'torvalds/master' ...

Signed-off-by: Huang, Tao <huangtao@rock-chips.com>

Conflicts:
	arch/arm/include/asm/arm-cci.h
	drivers/android/binder.c
	drivers/android/binder_trace.h
	drivers/block/zram/Kconfig
	drivers/net/wireless/rockchip_wlan/esp8089/esp_premalloc/version.h
	include/kvm/arm_arch_timer.h
	include/linux/pl320-ipc.h
	include/linux/zsmalloc.h
	include/uapi/linux/android/binder.h

2015-11-11 19:52:00 +08:00

..

adp5588.h

gpio: adp5588 - use "unsigned" for the setup and teardown callbacks

2014-02-13 13:51:17 +01:00

adp8860.h

…

adp8870.h

backlight: new driver for the ADP8870 backlight devices

2011-06-15 20:03:59 -07:00

ads1015.h

hwmon: (ads1015) Make gain and datarate configurable

2011-03-21 17:59:37 +01:00

apds990x.h

drivers/misc: driver for APDS990X ALS and proximity sensors

2010-10-26 16:52:14 -07:00

bfin_twi.h

i2c: bfin-twi: move bits macros and structs in header from arch include to generic include

2014-03-09 08:40:41 +01:00

bh1770glc.h

drivers/misc: driver for bh1770glc / sfh7770 ALS and proximity sensor

2010-10-26 16:52:14 -07:00

bq2415x.h

rk30:phone:modify the config file and add battery function

2012-05-07 16:17:52 +08:00

dm355evm_msp.h

…

ds620.h

hwmon: Support for Dallas Semiconductor DS620

2011-01-09 09:10:10 -08:00

i2c-hid.h

HID: i2c-hid: add DT bindings

2013-07-31 12:10:31 +02:00

i2c-sh_mobile.h

i2c: i2c-sh_mobile: support I2C hardware block with a faster operating clock

2012-11-16 09:09:12 +01:00

lm8323.h

…

ltc4245.h

hwmon: (ltc4245) Expose all GPIO pins as analog voltages

2010-08-14 21:08:49 +02:00

max732x.h

…

max6639.h

hwmon: Driver for Maxim MAX6639

2011-03-14 22:36:24 -07:00

mcs.h

Input: mcs_touchkey - add support for suspend/resume

2011-02-23 21:43:31 -08:00

mms114.h

Input: add MELFAS mms114 touchscreen driver

2012-07-17 23:16:17 -07:00

mpr121_touchkey.h

Input: add driver FSL MPR121 capacitive touch sensor

2011-05-12 08:28:58 -07:00

pca954x.h

i2c-mux: Add support for device auto-detection

2012-10-05 22:23:51 +02:00

pcf857x.h

gpio: pcf857x: use client->irq for gpio_to_irq()

2012-12-07 09:16:12 +01:00

pmbus.h

hwmon: (pmbus) Add regulator support

2014-11-30 20:13:13 -08:00

pxa-i2c.h

i2c: pxa: enable high speed mode for i2c bus

2013-08-07 16:58:07 +02:00

sx150x.h

gpio: sx150x: correct and refine reset-on-probe behavior

2010-09-09 18:57:24 -07:00

tc35876x.h

gma500: initial medfield merge

2012-03-10 13:05:48 +00:00

tca6424.h

modify expand gpio tca6424'interrupt to respond Matrix Keyboard,At the same

2010-09-07 19:18:03 -07:00

tps65010.h

…

tsc2007.h

Input: tsc2007 - remove unused poll_delay from platform data

2013-11-25 18:27:54 -08:00

twl4030-madc.h

mfd: twl4030-madc: Cleanup driver

2014-03-18 08:13:39 +00:00

twl6030-gpadc.h

rk30:phone:modify the config file and add battery function

2012-05-07 16:17:52 +08:00

twl6030-madc.h

rk30:phone:modify the config file and add battery function

2012-05-07 16:17:52 +08:00

twl.h

mfd: twl4030-power: Fix pmic for boards that need AC charger disabled

2015-06-22 12:25:04 +01:00