Merge tag 'backport/v3.14.24-ltsi-rc1/rcar-thermal-to-v3.18-rc4' into backport/v3...
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 01:59:06 +0000 (10:59 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 01:59:06 +0000 (10:59 +0900)

Trivial merge