Merge NetBSD -current.
Merge branch 'netbsd-current'
Merge OpenBSD -current.
Merge branch 'openbsd-current'
Manual merge of OpenBSD -current changes, kernel part, with:

git diff dc120473~..dc120473 openbsd/src/sys/dev/pci/drm | \
        patch -p2

    XXX Need to merge Xenocara changes.
Merge new AGP functions from OpenBSD.
Amend previous to mimic what OpenBSD does.
Manual merge of OpenBSD -current changes, Xenocara libdrm part, with:

git diff dc120473~..dc120473 openbsd/xenocara/lib/libdrm | \
    patch -d xsrc/external/mit/libdrm/dist -p5
Make #if conditions behave for NetBSD as they do for OpenBSD.
OpenBSD Xenocara's libdrm has been updated to 2.4.31.
Use the same DRM_MAJOR definition as in vanilla NetBSD.
Manual merge of OpenBSD -current changes, Xenocara xf86-video-intel part, with:

git diff dc120473~..dc120473 openbsd/xenocara/driver/xf86-video-intel | \
        patch -d xsrc/external/mit/xf86-video-intel/dist -p5
Post merge fix: adapt xf86-video-intel's Makefile (in src/external).
Add drm_mode.h to Makefile and set list.
Post-merge fix: fix build error.
Typo.
Use clflush instead of wbinvd, when possible.  From OpenBSD.
Fix printf format to prevent build error (XEN3PAE_DOM0/i386).
Merge NetBSD -current.
Merge branch 'netbsd-current'