diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-10-09 06:36:13 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-09 06:36:13 -0400 |
| commit | 37bf06375c90a42fe07b9bebdb07bc316ae5a0ce (patch) | |
| tree | de572dd6d3955b0725001776a7b03796f99e1e8e /include/linux/regulator/driver.h | |
| parent | 6bfa687c19b7ab8adee03f0d43c197c2945dd869 (diff) | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af (diff) | |
Merge tag 'v3.12-rc4' into sched/core
Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.
Conflicts:
arch/avr32/include/asm/Kbuild
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/regulator/driver.h')
| -rw-r--r-- | include/linux/regulator/driver.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h index 67e13aa5a478..9bdad43ad228 100644 --- a/include/linux/regulator/driver.h +++ b/include/linux/regulator/driver.h | |||
| @@ -40,6 +40,8 @@ enum regulator_status { | |||
| 40 | }; | 40 | }; |
| 41 | 41 | ||
| 42 | /** | 42 | /** |
| 43 | * struct regulator_linear_range - specify linear voltage ranges | ||
| 44 | * | ||
| 43 | * Specify a range of voltages for regulator_map_linar_range() and | 45 | * Specify a range of voltages for regulator_map_linar_range() and |
| 44 | * regulator_list_linear_range(). | 46 | * regulator_list_linear_range(). |
| 45 | * | 47 | * |