Merge branch 'drm-next0420' of https://github.com/markyzq/kernel-drm-rockchip into...
authorDave Airlie <airlied@redhat.com>
Sun, 3 May 2015 22:56:27 +0000 (08:56 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 3 May 2015 22:56:27 +0000 (08:56 +1000)
one fix and maintainers update
* 'drm-next0420' of https://github.com/markyzq/kernel-drm-rockchip:
  drm/rockchip: fix error check when getting irq
  MAINTAINERS: add entry for Rockchip drm drivers

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge