[Intel-gfx] non-fast-forward

[Eric Anholt]

I pushed a rebase away of the xvmc-vld merge revert revert disaster.
The two reverts were noops while ruining the history.  You may find a
need to reset your master to origin/master.

-- 
Eric Anholt
eric at anholt.net                         eric.anholt at intel.com


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20090609/af7b6c4e/attachment.sig>