summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include/asm/rio.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 10:13:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-27 10:13:01 -0700
commitf7fc06e3a47d68831a21f6aabf2a80648846602b (patch)
treee167b892f133fba24d71ba1c93a854ea5d4517a0 /arch/powerpc/include/asm/rio.h
parentea0ca3a843babd50c22dfbb5cf2d9a14df821b2b (diff)
parentcb220d16f91f8d5fa1450c7af17e028e8cb3f0f1 (diff)
downloadblackbird-op-linux-f7fc06e3a47d68831a21f6aabf2a80648846602b.tar.gz
blackbird-op-linux-f7fc06e3a47d68831a21f6aabf2a80648846602b.zip
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: (42 commits) regulator: Fix _regulator_get_voltage if get_voltage callback is NULL USB: TWL6025 allow different regulator name REGULATOR: TWL6025: add support to twl-regulator regulator: twl6030: do not write to _GRP for regulator disable regulator: twl6030: do not write to _GRP for regulator enable TPS65911: Comparator: Add comparator driver TPS65911: Add support for added GPIO lines GPIO: TPS65910: Move driver to drivers/gpio/ TPS65911: Add new irq definitions regulator: tps65911: Add new chip version MFD: TPS65910: Add support for TPS65911 device regulator: Fix off-by-one value range checking for mc13xxx_regulator_get_voltage regulator: mc13892: Fix voltage unit in test case. regulator: Remove MAX8997_REG_BUCK1DVS/MAX8997_REG_BUCK2DVS/MAX8997_REG_BUCK5DVS macros mfd: Fix off-by-one value range checking for tps65910_i2c_write regulator: Only apply voltage constraints from consumers that set them regulator: If we can't configure optimum mode we're always in the best one regulator: max8997: remove useless code regulator: Fix memory leak in max8998_pmic_probe failure path regulator: Fix desc_id for tps65023/6507x/65910 ...
Diffstat (limited to 'arch/powerpc/include/asm/rio.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud