diff options
author | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 12:33:04 -0700 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-21 12:33:04 -0700 |
commit | 36092ee8ba695fce023b2118ececa6c2a56b1331 (patch) | |
tree | b9579893cdd559e7b72fa569003b19792de58fad /drivers/thermal/of-thermal.c | |
parent | 1b982baf75e7d9585967fcfccd05b77bf9054010 (diff) | |
parent | 03dca343afe080968d90c4d9196404b5bbbc8461 (diff) | |
download | talos-obmc-linux-36092ee8ba695fce023b2118ececa6c2a56b1331.tar.gz talos-obmc-linux-36092ee8ba695fce023b2118ececa6c2a56b1331.zip |
Merge branch 'for-4.7/dax' into libnvdimm-for-next
Diffstat (limited to 'drivers/thermal/of-thermal.c')
0 files changed, 0 insertions, 0 deletions