Merge tag 'v4.10-rc5' into for-linus
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 24 Jan 2017 17:57:18 +0000 (09:57 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 24 Jan 2017 17:57:18 +0000 (09:57 -0800)
Sync up with mainline to apply fixup to a commit that came through
power supply tree.


Trivial merge