Merge branch 'origin' into modesetting-101
authorDave Airlie <airlied@linux.ie>
Thu, 26 Apr 2007 05:56:21 +0000 (15:56 +1000)
committerDave Airlie <airlied@linux.ie>
Thu, 26 Apr 2007 05:56:21 +0000 (15:56 +1000)
commitb589b846e73bfe6235cd702bb8ae89701c85eaab
treec54ddc23cfba3b5d9fafb86477d20fde4c36a52a
parent34be91fe4e9f0ad73b7c4354aea0c8ce10f45f68
parent5c8561aae22138880673503d930af7f1b361d071
Merge branch 'origin' into modesetting-101
linux-core/drmP.h
linux-core/drm_objects.h