Merge tag 'v3.19-rc4' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 15 Jan 2015 17:46:14 +0000 (09:46 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 15 Jan 2015 17:46:14 +0000 (09:46 -0800)
Merge with mainline to bring in the latest thermal and other changes.


Trivial merge