黄涛 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
..
acpi	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
asm-generic	Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0	2011-10-28 16:07:07 +08:00
crypto
drm	drm/i915: Fix typo in DRM_I915_OVERLAY_PUT_IMAGE ioctl define	2011-08-15 18:31:35 -07:00
keys	Revert "Merge remote-tracking branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:09:59 +08:00
linux	Merge remote-tracking branch 'origin/develop-3.0-rk2928' into develop-3.0	2012-08-17 21:48:20 +08:00
math-emu	Revert "Merge remote branch 'linux-2.6.32.y/master' into develop"	2011-07-30 16:24:52 +08:00
media	camera rk30: fix struct rk_camera_work may be reentrant,version update to v0.2.11, and add support sp2518 sensor	2012-08-14 15:11:36 +08:00
mtd
net	add MTK-combo-module	2012-08-10 14:02:20 +08:00
pcmcia
rdma
rxrpc
scsi	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
sound	add incalling cannot suspend interface	2012-02-11 16:18:12 +08:00
target
trace	Revert "Merge commit 'v2.6.32.9' into android-2.6.32"	2011-07-30 22:24:29 +08:00
video	revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36	2011-10-28 16:02:47 +08:00
xen	revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36	2011-10-28 16:02:47 +08:00
Kbuild