diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-25 12:50:08 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-25 12:50:08 -0800 |
commit | 8e45099e029bb6b369b27d8d4920db8caff5ecce (patch) | |
tree | 2ad93eb736e3509140fbb7ab265286d35daf061f /fs/omfs/Makefile | |
parent | 7e3528c3660a2e8602abc7858b0994d611f74bc3 (diff) | |
parent | 90ba0813db2c96c82e9ba24f30fb96a24a2cd3a8 (diff) | |
download | blackbird-obmc-linux-8e45099e029bb6b369b27d8d4920db8caff5ecce.tar.gz blackbird-obmc-linux-8e45099e029bb6b369b27d8d4920db8caff5ecce.zip |
Merge tag 'regulator-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fixes from Mark Brown:
"A bunch of fixes, a few driver specific ones and a framework fix for
voltage enumeration on fixed voltage regulators which had previously
worked but had been misplaced during some refactoring causing problems
for users that needed to know the voltage"
* tag 'regulator-v3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: arizona-micsupp: Correct wm5110 voltage selection
regulator: pfuze100: allow misprogrammed ID
regulator: fixed: fix regulator_list_voltage() for regression
regulator: gpio-regulator: Don't oops on missing regulator-type property
Diffstat (limited to 'fs/omfs/Makefile')
0 files changed, 0 insertions, 0 deletions