]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mce-therm' into next
authorTony Luck <tony.luck@intel.com>
Fri, 14 Jun 2013 21:49:35 +0000 (14:49 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 14 Jun 2013 21:49:35 +0000 (14:49 -0700)

Trivial merge