Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Apr 2010 19:31:52 +0000 (12:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 21 Apr 2010 19:31:52 +0000 (12:31 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  mc13783-regulator: fix a memory leak in mc13783_regulator_remove
  regulator: Let drivers know when they use the stub API


Trivial merge