Merge branch 'psmouse' into next

Merge various PS/2 handling improvements.