黄涛 f30ecbfd21 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb ... Conflicts: drivers/net/wireless/ath/ath9k/hw.c drivers/net/wireless/ath/ath9k/main.c drivers/net/wireless/rtl818x/rtl8187/leds.c		2012-07-18 11:12:45 +08:00
..
drm	drm/i915: Fix eDP blank screen after S3 resume on HP desktops	2012-07-16 08:47:39 -07: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