黄涛 223378cc0f Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next ... Conflicts: drivers/mmc/host/Kconfig drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.h drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.h include/linux/mmc/rk_mmc.h include/linux/rockchip/cru.h		2014-07-07 21:01:04 +08:00
..
arm	Merge remote-tracking branch 'origin/develop-3.10' into develop-3.10-next	2014-07-07 21:01:04 +08:00
drm	lsk 14.05 android release	2014-06-12 21:04:26 +08:00
host1x	drivers/gpu/host1x/drm: don't check resource with devm_ioremap_resource	2013-05-18 11:55:30 +02:00
vga	fbcon: fix locking harder	2013-02-08 12:02:43 +10:00
Makefile	add gpu for xxm	2014-03-21 02:40:59 +08:00