]> Pileus Git - ~andy/linux/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)
commitf157f5964bdc604d8cbf0b71780a0d47ea9f7371
tree8667f1068b026c640cae1a6cb229ca4944c8c3c7
parent30072fb91e1447b00fa148500c49010265b530c6
parent23be63f48d928cd5a21db58f73c731357e895250
Merge branch 'cpu-package-thermal' of .git into next

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