]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'cpu-package-thermal' of .git into next
authorZhang Rui <rui.zhang@intel.com>
Mon, 17 Jun 2013 22:31:26 +0000 (06:31 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 17 Jun 2013 22:31:26 +0000 (06:31 +0800)
commitb81d666df8b54e94cf61f3c56b6673592ee34c92
tree8667f1068b026c640cae1a6cb229ca4944c8c3c7
parent26c44ad8ea85706d4dfab6af7d68b70c40dc93c3
parent13b9a89d7cfa25f9d4c391d6b3a6f2cb99d08280
Merge branch 'cpu-package-thermal' of .git into next

Conflicts:
drivers/thermal/Kconfig
drivers/thermal/Makefile
drivers/thermal/Kconfig
drivers/thermal/Makefile