summaryrefslogtreecommitdiff
path: root/tcp.conf
diff options
context:
space:
mode:
Diffstat (limited to 'tcp.conf')
0 files changed, 0 insertions, 0 deletions
'>80a77045daacc660659093b312ca0708b53ed558 (diff)parent87260d3f7aecba9a5fadc6886c338b2a8fccfca9 (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