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)
commit9e26220286dc79eeeef25de138b144fde3d41a85
tree068bc49ee9d9d2c1bb187522aae21d2a7cb8a4fe
parentcc0cc1aa279067207085b75a674453e021879801
parent4b9a90c0b374f8f7b3ceabe3c202424c98a6c5a4
Merge branch 'drm-next' of https://github.com/markyzq/kernel-drm-rockchip into drm-next

single rockchip fix.

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