Huang, Tao 1ca180425c Merge tag 'lsk-v3.10-android-15.02' ...

LSK Android 15.02 v3.10

Conflicts:
	drivers/Kconfig
	drivers/regulator/core.c
	include/linux/of.h

2015-03-05 17:11:40 +08:00

..

algos

rk: revert 20f3d0b+v3.0.66 to v3.0

2013-11-08 21:34:05 +08:00

busses

Merge branch develop-3.10 into develop-3.10-next

2015-02-10 16:43:50 +08:00

muxes

i2c: mux: gpio: use gpio_set_value_cansleep()

2013-12-04 10:55:50 -08:00

i2c-boardinfo.c

rk: temp revert rk change

2013-11-08 21:33:42 +08:00

i2c-core.c

Merge tag 'lsk-v3.10-android-15.02'

2015-03-05 17:11:40 +08:00

i2c-core.h

i2c: Update the FSF address

2012-03-26 21:47:19 +02:00

i2c-dev.c

rk: temp revert rk change

2013-11-08 21:33:42 +08:00

i2c-mux.c

i2c: move OF helpers into the core

2015-02-21 12:10:58 +09:00

i2c-smbus.c

i2c-smbus: Convert kzalloc to devm_kzalloc

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

i2c-stub.c

i2c-stub: Move to drivers/i2c

2012-10-28 21:37:00 +01:00

Kconfig

drivers/i2c: remove !S390 dependency, add missing GENERIC_HARDIRQS dependencies

2013-03-11 09:59:02 +01:00

Makefile

i2c-stub: Move to drivers/i2c

2012-10-28 21:37:00 +01:00