summaryrefslogtreecommitdiffstats
path: root/include/linux/dlm.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 11:49:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-25 11:49:41 -0700
commit99765cc7e393c8637abaaf0c73f28ec63370d35c (patch)
treec386ff98390afe9a5f2626dbd3c49b7371a020eb /include/linux/dlm.h
parent51e618c357b39597b474165c5d17067afe8f16a6 (diff)
parent500b4ac90d1103a7c302d5bb16c53f4ffc45d057 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: return set_mode is same mode is requested Regulators: ab3100/bq24022: add a missing .owner field in regulator_desc twl6030: regulator: Remove vsel tables and use formula for calculation mc13783-regulator: fix vaild voltage range checking for mc13783_fixed_regulator_set_voltage regulator: use voltage number array in 88pm860x regulator: make 88pm860x sharing one driver structure regulator: simplify regulator_register() error handling regulator: fix unset_regulator_supplies() to remove all matches regulator: prevent registration of matching regulator consumer supplies regulator: Allow regulator-regulator supplies to be specified by name
Diffstat (limited to 'include/linux/dlm.h')
0 files changed, 0 insertions, 0 deletions