Merge branches 'intel_powerclamp', 'tmon' and 'misc' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Thu, 7 Nov 2013 00:45:54 +0000 (08:45 +0800)
committerZhang Rui <rui.zhang@intel.com>
Thu, 7 Nov 2013 00:45:54 +0000 (08:45 +0800)

Trivial merge