Merge branch 'drm-next' of https://github.com/markyzq/kernel-drm-rockchip into drm...
authorDave Airlie <airlied@redhat.com>
Tue, 27 Jan 2015 00:05:44 +0000 (10:05 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 27 Jan 2015 00:05:44 +0000 (10:05 +1000)
single rockchip fix.

* 'drm-next' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: fix dma_alloc_attrs() error check


Trivial merge