lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge Linus master to drm-next

Browse Source 
linux-next conflict reported needed resolution.

Conflicts:
	drivers/gpu/drm/drm_crtc.c
	drivers/gpu/drm/drm_edid.c
	drivers/gpu/drm/i915/intel_sdvo.c
	drivers/gpu/drm/radeon/radeon_ttm.c
	drivers/gpu/drm/ttm/ttm_bo.c
This commit is contained in:
Dave Airlie
2009-08-20 13:38:04 +10:00
parent a987fcaa80 6c30c53fd5
commit 51c8b4071d
1343 changed files with 36520 additions and 18474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/drm/ttm/ttm_module.h
View File

@@ -34,7 +34,7 @@
#include <linux/kernel.h>
struct kobject;
#define TTM_PFX "[TTM]"
#define TTM_PFX "[TTM] "
enum ttm_global_types {
TTM_GLOBAL_TTM_MEM = 0,