linux-uconsole/include/linux/i2c
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
adp8860.h
adp8870.h
ads1015.h
apds990x.h
bfin_twi.h
bh1770glc.h
bq2415x.h
dm355evm_msp.h
ds620.h
i2c-hid.h
i2c-sh_mobile.h
lm8323.h
ltc4245.h
max732x.h
max6639.h
mcs.h
mms114.h
mpr121_touchkey.h
pca954x.h
pcf857x.h
pmbus.h
pxa-i2c.h
sx150x.h
tc35876x.h
tca6424.h
tps65010.h
tsc2007.h
twl.h mfd: twl4030-power: Fix pmic for boards that need AC charger disabled 2015-06-22 12:25:04 +01:00
twl4030-madc.h
twl6030-gpadc.h
twl6030-madc.h