Merge remote branch 'origin/master' into modesetting-101
authorDave Airlie <airlied@linux.ie>
Thu, 8 May 2008 00:25:01 +0000 (10:25 +1000)
committerDave Airlie <airlied@linux.ie>
Thu, 8 May 2008 00:25:01 +0000 (10:25 +1000)
commitef204fb5c24f9bd09192a9abebad6a06dd0b88db
treea72ee9071462457b27475c2cc86e3c6256388ea9
parent7f269bec7ed49385de394fdbd970f463ef2060f0
parentb44f2da380e78769b58c751e81f376f0fa1f48aa
Merge remote branch 'origin/master' into modesetting-101

Conflicts:

linux-core/Makefile.kernel
shared-core/i915_drv.h
linux-core/Makefile.kernel
linux-core/drm_compat.c
linux-core/drm_compat.h
linux-core/i915_drv.c
shared-core/i915_drv.h