From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 9 Jul 2011 06:26:28 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
X-Git-Tag: Ubuntu-5.0.0-8.9~18308
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b56045d4019a80935ead337e5c3f8e211fa9b471;p=mirror_ubuntu-disco-kernel.git

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:
  regulator: max8997: Fix setting inappropriate value for ramp_delay variable
  regulator: db8500-prcmu: small fixes
  regulator: max8997: remove dependency on platform_data pointer
  regulator: MAX8997: Fix for divide by zero error
  regulator: max8952 - fix wrong gpio valid check
---

b56045d4019a80935ead337e5c3f8e211fa9b471