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

Trivial merge