黄涛 14d96d73a2 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ... Merge v3.0.65 Conflicts: Makefile drivers/net/wireless/ath/ath9k/beacon.c drivers/net/wireless/ath/ath9k/htc_hst.c		2013-02-18 12:31:44 +08:00
..
drm	drm/radeon: Calling object_unrefer() when creating fb failure	2013-02-11 08:16:47 -08:00
ion	ion: update ion drivers	2012-05-09 16:16:34 +08:00
stub	i915: select VIDEO_OUTPUT_CONTROL for ACPI_VIDEO	2011-04-13 09:10:25 +10:00
vga	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2011-05-24 12:06:40 -07:00
Makefile	gpu: ion: Add ION Memory Manager	2011-06-29 19:44:29 -07:00