Merge tag 'drm-hisilicon-next-2016-04-29' of github.com:xin3liang/linux into drm...