Merge tag 'backport/v3.14.24-ltsi-rc1/pm-runtime-20141105' into backport/v3.14.24...
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 01:38:07 +0000 (10:38 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 01:38:07 +0000 (10:38 +0900)

Trivial merge