Merge checker fixes from Alan Cox made to the drm in the ac kernel tree.

    These aren't really security problems, but Alan has made some arguments
    that have convinced me that the code should be fixed anyway.