linux-next: manual merge of the drm tree

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in include/Kbuild
between commit 4896a02e1e6d4f0ae5b23c24eff0ba10e26caab4 ("kbuild: only
one call for include/ in make headers_*") from the kbuild tree and commit
ae74c0f7f4abab0cf1e943c562b52df8868dc1ee ("drm: reorganise drm tree to be
more future proof") from the drm tree.

The former removes a line just where the latter is adding one. I fixed it
up and can carry the fix.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/