summaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-04-10 09:15:46 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-10 09:15:46 -0700
commit190a3998be3ede25d6145e187d6d321f504d28fb (patch)
treead5d6ec7d701b2af054e4922502810908226c0d3 /sound/oss
parent4162877d3ffa900b618c369c490c7faa6af60e47 (diff)
parent9477165ec525d47abb1cb6523698e0cd89d65ddb (diff)
downloadlinux-190a3998be3ede25d6145e187d6d321f504d28fb.tar.bz2
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management updates from Zhang Rui: "We only have a couple of fixes/cleanups for platform thermal drivers this time. Specifics: - rcar thermal driver: avoid updating the thermal zone in case an IRQ was triggered but the temperature didn't effectively change. From Patrick Titiano. - update the imx thermal driver' formula of converting thermal sensor' raw date to real temperature in degree C. From Anson Huang. - trivial code cleanups of ti soc thermal and rcar thermal driver from Jingoo Han and Patrick Titiano" * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: thermal: rcar-thermal: update thermal zone only when temperature changes thermal: rcar-thermal: fix same mask applied twice thermal: ti-soc-thermal: Use SIMPLE_DEV_PM_OPS macro thermal: imx: update formula for thermal sensor
Diffstat (limited to 'sound/oss')
0 files changed, 0 insertions, 0 deletions