diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2013-06-18 00:31:26 +0200 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-06-18 00:31:26 +0200 |
| commit | f157f5964bdc604d8cbf0b71780a0d47ea9f7371 (patch) | |
| tree | 8667f1068b026c640cae1a6cb229ca4944c8c3c7 /Documentation/ptp | |
| parent | Merge branches 'for-rc' and 'ti-soc' of .git into next (diff) | |
| parent | Thermal: Documentation for x86 package temperature thermal driver (diff) | |
| download | linux-f157f5964bdc604d8cbf0b71780a0d47ea9f7371.tar.xz linux-f157f5964bdc604d8cbf0b71780a0d47ea9f7371.zip | |
Merge branch 'cpu-package-thermal' of .git into next
Conflicts:
drivers/thermal/Kconfig
drivers/thermal/Makefile
Diffstat (limited to 'Documentation/ptp')
0 files changed, 0 insertions, 0 deletions