| commit | f157f5964bdc604d8cbf0b71780a0d47ea9f7371 | [log] [tgz] |
|---|---|---|
| author | Zhang Rui <rui.zhang@intel.com> | Tue Jun 18 06:31:26 2013 +0800 |
| committer | Zhang Rui <rui.zhang@intel.com> | Tue Jun 18 06:31:26 2013 +0800 |
| tree | 8667f1068b026c640cae1a6cb229ca4944c8c3c7 | |
| parent | 30072fb91e1447b00fa148500c49010265b530c6 [diff] | |
| parent | 23be63f48d928cd5a21db58f73c731357e895250 [diff] |
Merge branch 'cpu-package-thermal' of .git into next Conflicts: drivers/thermal/Kconfig drivers/thermal/Makefile