tree 67f0a50e3135acd63348882d8ef836b498450f5f
parent 9c7cb99a8202452d3e0440a5505c5c6d262771d9
parent c8f1e5025ca2fa8e6e037451f3d271e66745a19b
author Linus Torvalds <torvalds@linux-foundation.org> 1245083257 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1245083257 -0700

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/max1586: fix V3 gain calculation integer overflow
  regulator/max1586: support increased V3 voltage range
  regulator: lp3971 - fix driver link error when built-in.
  LP3971 PMIC regulator driver (updated and combined version)
  regulator: remove driver_data direct access of struct device
  regulator: Set MODULE_ALIAS for regulator drivers
  regulator: Support list_voltage for fixed voltage regulator
  regulator: Move regulator drivers to subsys_initcall()
  regulator: build fix for powerpc - renamed show_state
  regulator: add userspace-consumer driver
  Maxim 1586 regulator driver