Merge tag 'backport/v3.14.24-ltsi-rc1/mach-shmobile-20141211' into backport/v3.14...
authorSimon Horman <horms+renesas@verge.net.au>
Thu, 11 Dec 2014 04:36:36 +0000 (13:36 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Thu, 11 Dec 2014 04:36:36 +0000 (13:36 +0900)

Trivial merge