Merge remote branch 'origin/master' into libdrm
authorKristian Høgsberg <krh@bitplanet.net>
Fri, 20 Nov 2009 22:09:03 +0000 (17:09 -0500)
committerKristian Høgsberg <krh@bitplanet.net>
Fri, 20 Nov 2009 22:09:03 +0000 (17:09 -0500)
commit10ce0ec18806ae32a5d615c693626a085b0dd7b8
tree0511e492b1235ef8d45cb7997035421c409a26b5
parent1b064cc428f03f753699d4d9fbe60453891a8529
parentb4312b639d56a6cad78953af0fd4f863182007e3
Merge remote branch 'origin/master' into libdrm
intel/intel_bufmgr.c
intel/intel_bufmgr.h
intel/intel_bufmgr_gem.c
intel/intel_bufmgr_priv.h
nouveau/nouveau_class.h
radeon/radeon_bo.h