summaryrefslogtreecommitdiff
path: root/trafgen_l3.h
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2016-06-22 09:30:29 +0200
committerTobias Klauser <tklauser@distanz.ch>2016-06-22 09:30:29 +0200
commit14c81587037b03554819972f9b3965712cacd0f1 (patch)
tree535a2efd33f735670f4a9dc4a3dbe8f50f5c704f /trafgen_l3.h
parentb0230ce4b1cdfce252a6a04873098f911af5e104 (diff)
AUTHORS: Add Hisao Tanabe for his contribution
Add Hisao Tanabe to AUTHORS for commit b0230ce4 ("man: netsniff-ng: Fix usage example description"). Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'trafgen_l3.h')
0 files changed, 0 insertions, 0 deletions
b483cf5&id2=4935e04ef431c7980ba6e8145ad4c697abccf6b9'>diff)parent829bc78aa7628e81a9de717316b85cbee3c5eb86 (diff)
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal fixes from Zhang Rui: - Fix cpu_cooling to have separate thermal_cooling_device_ops structures for cpus with and without power model, to avoid NULL dereference in cpufreq_state2power. From Brendan Jackman. - Fix a possible NULL dereference in imx_thermal driver. From Corentin LABBE. - Another two trivial fixes, one typo fix and one deleting module owner. From Caesar Wang and Markus Elfring. * 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal: imx: fix a possible NULL dereference thermal: trivial: fix the typo Thermal-INT3406: Delete owner assignment thermal: cpu_cooling: Fix NULL dereference in cpufreq_state2power
Diffstat (limited to 'Documentation/devicetree')