Merge tag 'backport/v3.14.24-ltsi-rc1/micrel-20141210' into backport/v3.14.24-ltsi...
authorSimon Horman <horms+renesas@verge.net.au>
Wed, 10 Dec 2014 04:54:00 +0000 (13:54 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Wed, 10 Dec 2014 04:54:00 +0000 (13:54 +0900)

Trivial merge