Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git