From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 12 Feb 2010 16:48:35 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
X-Git-Tag: v2.6.33-rc8~5
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=280c96b16a732cec207ccef7f70cb9ec727d3fd9;p=linux.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/lp3971: vol_map out of bounds in lp3971_{ldo,dcdc}_set_voltage()
  regulator: Fix display of null constraints for regulators
---

280c96b16a732cec207ccef7f70cb9ec727d3fd9