33b44f
Merge branches 'users/msuchanek/master/for-next' and 'users/tzimmermann/master/for-next' into master Pull a ppc64 config cleanup from Michal Suchánek. Pull a DRM config cleanup from Thomas Zimmermann.