From: Linus Torvalds Date: Tue, 28 Apr 2009 23:06:33 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6 X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=8b86bd7a4a82157d386aebafbe1bdf26bdf3d713;p=linux-edison.git Merge branch 'for-linus' of git://git./linux/kernel/git/lrg/voltage-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: Fix default constraints for fixed voltage regulators regulator/bq24022: fix bug in is_enabled function regulator/virtual: fix strings compare predicates regulator core: fix double-free in regulator_register() error path drivers/regulator: fix when type is different from REGULATOR_VOLTAGE or REGULATOR_CURRENT unreachable code in drms_uA_update() regulator: fix header file missing kernel-doc --- 8b86bd7a4a82157d386aebafbe1bdf26bdf3d713