Merge tag 'platform-drivers-x86-v4.10-2' of git://git.infradead.org/users/dvhart...