tree d6063bd97f82371068befb082e8efc1dd778f18f
parent f9ae3e125ceb8226c94d7d0c640927fa8b7f256a
parent 1b39ed0cf51193f3ba03044369ab4d144712a9b8
author Linus Torvalds <torvalds@linux-foundation.org> 1292362401 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1292362401 -0800

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: tps6586x: correct register table
  regulator: tps6586x: Handle both enable reg/bits being the same
  regulator: tps6586x: Fix TPS6586X_DVM to store goreg/bit
  regulator: tps6586x: Add missing bit mask generation