Merge branch 'for-paulus' of git://kernel/home/michael/src/work/