Merge branch 'modesetting-dirty-libdrm'
authorJakob Bornecrantz <jakob@vmware.com>
Wed, 2 Dec 2009 18:40:58 +0000 (19:40 +0100)
committerJakob Bornecrantz <jakob@vmware.com>
Wed, 2 Dec 2009 18:40:58 +0000 (19:40 +0100)
commit3bd834a2178ee1273fd84628e87210a500f8fc84
treec123835954f8b2733cc72390934125d6d71badd3
parentbe957cc219d0811e2d1ed2a56549a03cb64a0f4b
parentac5595abc1c28b2c10a1463143e83d17415736f1
Merge branch 'modesetting-dirty-libdrm'

Conflicts:
include/drm/drm.h
include/drm/drm.h
include/drm/drm_mode.h
xf86drmMode.c
xf86drmMode.h