]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
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)
1  2 
drivers/thermal/Kconfig

Simple merge