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