From: Dave Airlie Date: Tue, 27 Jan 2015 00:05:44 +0000 (+1000) Subject: Merge branch 'drm-next' of https://github.com/markyzq/kernel-drm-rockchip into drm-next X-Git-Tag: v4.0-rc1~74^2~27 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9e26220286dc79eeeef25de138b144fde3d41a85;p=linux.git 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 --- 9e26220286dc79eeeef25de138b144fde3d41a85