Skip to content
Commit 1bd049fa authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-core-next' into drm-linus 

Bring all core drm changes into 2.6.32 tree and resolve
the conflict that occurs.

Conflicts:
	drivers/gpu/drm/drm_fb_helper.c
parents 22763c5c b0a007dc
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment