黄涛 e153fabd0b Merge remote-tracking branch 'origin/develop-3.0-rk30' into develop-3.0 ... Conflicts: arch/arm/mach-rk29/Makefile arch/arm/mach-rk29/include/mach/rk29_camera.h drivers/gpu/ion/ion.c drivers/gpu/ion/ion_carveout_heap.c drivers/gpu/ion/ion_priv.h drivers/media/video/gc0307.c drivers/media/video/gc0308.c drivers/media/video/gc0309.c drivers/media/video/gc2015.c drivers/media/video/gt2005.c drivers/media/video/mt9d112.c drivers/media/video/mt9d113.c drivers/media/video/mt9p111.c drivers/media/video/mt9t111.c drivers/media/video/ov2640_rk.c drivers/media/video/ov2655.c drivers/media/video/ov2659.c drivers/media/video/ov5640.c drivers/media/video/ov5642.c drivers/media/video/ov7675.c drivers/media/video/rk29_camera.c drivers/media/video/sid130B.c drivers/media/video/siv120b.c drivers/mmc/host/rk29_sdmmc.c include/linux/ion.h		2012-03-25 15:16:37 +08:00
..
acpi
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
linux	Merge remote-tracking branch 'origin/develop-3.0-rk30' into develop-3.0	2012-03-25 15:16:37 +08:00
math-emu
media	z5 Phone:add OV7690 sensor support	2011-12-05 18:44:45 +08:00
mtd
net	revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36	2011-10-28 16:02:47 +08:00
pcmcia
rdma
rxrpc
scsi
sound	add incalling cannot suspend interface	2012-02-11 16:18:12 +08:00
target
trace
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