黄涛 d7fb2169b6 Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0 ... Conflicts: arch/arm/mach-rk30/include/mach/rk30_camera.h arch/arm/plat-rk/include/plat/rk_camera.h drivers/gpio/gpio-tps65910.c drivers/media/video/rk30_camera_oneframe.c drivers/mmc/host/rk29_sdmmc.c drivers/net/wireless/Kconfig drivers/net/wireless/Makefile drivers/net/wireless/wifi_sys/rkwifi_sys_iface.c drivers/regulator/rk30-pwm-regulator.c drivers/usb/dwc_otg/dwc_otg_driver.c drivers/usb/dwc_otg/dwc_otg_hcd.c drivers/usb/dwc_otg/dwc_otg_pcd.c sound/soc/codecs/Makefile sound/soc/rk29/Kconfig		2012-08-17 21:48:20 +08:00
..
algos	i2c: fix rk change for i2c gpio	2012-03-30 19:55:53 +08:00
busses	Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0	2012-08-17 21:48:20 +08:00
muxes	i2c/pca954x: Initialize the mux to disconnected state	2011-06-29 11:36:11 +02:00
i2c-boardinfo.c	Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0	2011-10-28 16:07:07 +08:00
i2c-core.c	i2c: fix bug: 'the transmission may be abnormal, if send the stop signal immediately after timeout'	2012-07-28 10:09:59 +08:00
i2c-core.h
i2c-dev.c	i2c-dev: struct i2c_msg: be compatible with standard interface	2012-05-21 10:39:03 +08:00
i2c-mux.c	i2c: Mark i2c_adapter.id as deprecated	2010-11-15 22:40:38 +01:00
i2c-smbus.c	i2c: Remove all i2c_set_clientdata(client, NULL) in drivers	2010-06-03 11:33:58 +02:00
Kconfig	Revert "i2c: Fix Kconfig dependencies"	2010-11-22 11:27:33 -02:00
Makefile	i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter	2011-03-20 14:50:53 +01:00