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)
commit62ed8ceda1699acae01b666497f004bfd3d67a6f
treefe38c83c49dfd568b540666948ef78cb9d082c38
parent1c3415a06b1016a596bfe59e0cfee56c773aa958
parent7a308bb3016f57e5be11a677d15b821536419d36
Merge tag 'v4.10-rc5' into for-linus

Sync up with mainline to apply fixup to a commit that came through
power supply tree.