Merge remote branch 'origin/master' into nvc0-new
authorBen Skeggs <bskeggs@redhat.com>
Mon, 20 Dec 2010 20:30:39 +0000 (06:30 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 20 Dec 2010 20:30:39 +0000 (06:30 +1000)
commite52ebd6e8587e2e37ed65ad9fc9035c2bd00b563
tree8dc271c2fdc6ceda6b329762d234c88e0fdffe2e
parent9f2cf899578464a7448d7abec681bde42eb3d2f2
parent5c102dd94f435e97507213fbd128e50dd15f5f54
Merge remote branch 'origin/master' into nvc0-new

Conflicts:
src/gallium/drivers/nouveau/nouveau_winsys.h
src/gallium/drivers/nouveau/nouveau_winsys.h