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)
commiteadcbfa58ae8693f0d6a0f591d8f51d55cf068e1
treecff3f1c56a8bf15138b652ee9dab50dddd6edee5
parentc4beedb8a914af9c8c1b6e67c753adf411e05160
parent5ed02dbb497422bf225783f46e6eadd237d23d6b
Merge tag 'v4.12-rc3' into for-linus

Merge with mainline to get acpi_dev_present() needed by patches to
axp20x-pek driver.