OSDN Git Service

Merge branch 'master' of ../../drm into modesetting-101
authorDave Airlie <airlied@redhat.com>
Fri, 7 Mar 2008 00:59:21 +0000 (11:59 +1100)
committerDave Airlie <airlied@redhat.com>
Fri, 7 Mar 2008 00:59:21 +0000 (11:59 +1100)
commitf96baf1e1ec10768ea2027f75ebaef46f7d7f30a
tree1c387c45449a42e5692dcc3d1a62e39dcd8ca53f
parentccae12a837e7b17c4e9211295ecbd18807020742
parent2540ea7dc6c0c4f0ebca3370d6ec7359e4276e13
Merge branch 'master' of ../../drm into modesetting-101
linux-core/drm_bo.c
linux-core/drm_compat.h