Merge branch 'tmon-fixes' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Sat, 28 Feb 2015 06:07:03 +0000 (14:07 +0800)
committerZhang Rui <rui.zhang@intel.com>
Sat, 28 Feb 2015 06:07:03 +0000 (14:07 +0800)

Trivial merge