Merge tag 'backport/v3.14.24-ltsi-rc1/rcar-snd-to-v3.18-rc6' into backport/v3.14...
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 08:49:10 +0000 (17:49 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 08:49:10 +0000 (17:49 +0900)

Trivial merge