黄涛 ef62b5225e Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ... Conflicts: Makefile drivers/net/wireless/ath/ath9k/xmit.c drivers/net/wireless/rt2x00/rt2800lib.c scripts/Kbuild.include		2012-12-01 12:07:55 +08:00
..
drm	drm/i915: fix overlay on i830M	2012-11-26 11:34:55 -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