Merge tag 'backport/v3.14.24-ltsi-rc1/mach-shmobile-to-renesas-next-20141119-v3.18...
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 08:49:11 +0000 (17:49 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 08:49:11 +0000 (17:49 +0900)

Trivial merge