summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/dlm/dlmthread.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 11:33:09 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-06 11:33:09 -0800
commitdff6d1c5ef9116a4478908001d72ee67127ecf01 (patch)
tree43c6e7ff8e8059f8fd733efd45b51f84b510d305 /fs/ocfs2/dlm/dlmthread.c
parent66ce3cf84deba6cc71dcf43c9d56a4278e5f712d (diff)
parenta0a5e3488a51c46f383c5faa86b53828e30ce153 (diff)
downloadop-kernel-dev-dff6d1c5ef9116a4478908001d72ee67127ecf01.zip
op-kernel-dev-dff6d1c5ef9116a4478908001d72ee67127ecf01.tar.gz
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: (23 commits) hwmon: Remove the deprecated adt7473 driver hwmon: Fix off-by-one kind values hwmon: (tmp421) Fix temperature conversions hwmon: (tmp421) Restore missing inputs hwmon: Driver for Andigilog aSC7621 family monitoring chips hwmon: (adt7411) Improve locking hwmon: Add driver for ADT7411 voltage and temperature sensor hwmon: (w83793) Add watchdog functionality hwmon: (g760a) Make rpm_from_cnt static hwmon: (it87) Validate auto pwm settings hwmon: (it87) Add support for old automatic fan speed control hwmon: (it87) Drop dead web links in documentation hwmon: (it87) Add an entry in MAINTAINERS hwmon: (it87) Use strict_strtol instead of simple_strtol hwmon: (it87) Fix many checkpatch errors and warnings hwmon: (it87) Add support for beep on alarm hwmon: (it87) Create vid attributes by group hwmon: (it87) Refactor attributes creation and removal hwmon: (it87) Expose the PWM/temperature mappings hwmon: (it87) Display fan outputs in automatic mode as such ...
Diffstat (limited to 'fs/ocfs2/dlm/dlmthread.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud