Merge branch 'cpu-package-thermal' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Mon, 17 Jun 2013 23:26:49 +0000 (07:26 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 17 Jun 2013 23:26:49 +0000 (07:26 +0800)
commit9d1968fdabc69981ea98ea82082de1cc12a60385
tree5a5d14ccde0b6d34a0a6ecca1131d0b397dc8008
parentf157f5964bdc604d8cbf0b71780a0d47ea9f7371
parentb3ba020652d1659ce3c07314fabffbe124fe49dd
Merge branch 'cpu-package-thermal' of .git into next
drivers/thermal/Kconfig