diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-10 14:27:35 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-10 14:27:35 -0700 |
| commit | 6285098f212ef8d8f05a69f0e3a7d4f421dd0ed7 (patch) | |
| tree | 972b7af1236b8596d2f7545ff6226db4541c9277 /drivers/net/can/spi/mcp251x.c | |
| parent | e1ad88356a2d3d0067f1ccd375ad15172b589001 (diff) | |
| parent | 1144afc25044c3db57f6756296788659bfe6b9d5 (diff) | |
Merge branch 'v4.1/topic/thermal' into linux-linaro-lsk-v4.1
* v4.1/topic/thermal:
thermal: power_allocator: trace the real requested power
Diffstat (limited to 'drivers/net/can/spi/mcp251x.c')
0 files changed, 0 insertions, 0 deletions