Merge tag 'platform-drivers-x86-v3.20-1' of git://git.infradead.org/users/dvhart...