Merge branches 'armada-375-380-soc-support', 'eduardo-thermal-soc-fixes', 'intel...
authorZhang Rui <rui.zhang@intel.com>
Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 15 May 2014 09:18:02 +0000 (17:18 +0800)

Trivial merge