]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'drm/drm-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:16:22 +0000 (14:16 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Dec 2011 03:16:22 +0000 (14:16 +1100)
commitd09941c8afcda2cb65d0f96420e098cb453f61f0
tree67bfabf55f80bb1fcf8f708a19ff38e2cf95bbdf
parent68575a09b58a0118a58ece2259a240eaffa069b0
parentd0d110e096298d2715aa26b3698e604e0d4a2fb9
Merge remote-tracking branch 'drm/drm-next'

Conflicts:
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c