Merge tag 'v4.12-rc3' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 3 Jun 2017 00:49:10 +0000 (17:49 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 3 Jun 2017 00:49:10 +0000 (17:49 -0700)
Merge with mainline to get acpi_dev_present() needed by patches to
axp20x-pek driver.


Trivial merge