diff options
author | Linus Torvalds | 2016-09-07 21:28:26 -0700 |
---|---|---|
committer | Linus Torvalds | 2016-09-07 21:28:26 -0700 |
commit | d71f058617564750261b673ea9b3352382b9cde4 (patch) | |
tree | 3601abf4d9de3be03509fe2a7293d4c07c9ab2ff /fs/pstore | |
parent | 80a77045daacc660659093b312ca0708b53ed558 (diff) | |
parent | 87260d3f7aecba9a5fadc6886c338b2a8fccfca9 (diff) |
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal fix from Zhang Rui:
"Only one patch this time, which fixes a crash in rcar_thermal driver.
From Dirk Behme"
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: rcar_thermal: Fix priv->zone error handling
Diffstat (limited to 'fs/pstore')
0 files changed, 0 insertions, 0 deletions