Merge branch 'drm-next' of git://people.freedesktop.org/~robclark/linux into drm...
authorDave Airlie <airlied@redhat.com>
Wed, 28 Aug 2013 04:27:15 +0000 (14:27 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 28 Aug 2013 04:27:15 +0000 (14:27 +1000)
Merge the MSM driver from Rob Clark
* 'drm-next' of git://people.freedesktop.org/~robclark/linux:
  drm/msm: add basic hangcheck/recovery mechanism
  drm/msm: add a3xx gpu support
  drm/msm: add register definitions for gpu
  drm/msm: basic KMS driver for snapdragon
  drm/msm: add register definitions


Trivial merge