Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 21 Jan 2014 23:11:09 +0000 (09:11 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 21 Jan 2014 23:11:09 +0000 (09:11 +1000)
commitaec476a6764687fd1a76a272f95537a0aed37a0c
tree5ce9c33b66764d444862ba591b03060d27764737
parent8c9b2e322d5c9b4e77fd308984ea303de4b63e1c
parent3e894a6259964618e29809b844bffaaf9849067b
Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next

Just a single fix for sparse/smatch warnings introduced by the previous
vmwgfx-next pull.

* 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Fix recently introduced sparse / smatch warnings and errors