Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
commit8b86bd7a4a82157d386aebafbe1bdf26bdf3d713
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Apr 2009 23:06:33 +0000 (28 16:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 28 Apr 2009 23:06:33 +0000 (28 16:06 -0700)
tree197acc909e754da972d709ad463783c23575df66
parentc3310e7766ebe7491910715c3161a4f29fa0112e
parent3e59091828ed5406c879b899b4257fcef7271e2c
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