tree a7570737884bef3c15db98cae629a82ce3586b3c
parent a7c2a10dab4e5122cbcfa3d5e9d589a52ccc2287
parent 0eb5d5ab3ec99bfd22ff16797d95835369ffb25b
author Linus Torvalds <torvalds@linux-foundation.org> 1217613400 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1217613400 -0700

Merge branch 'reg-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

* 'reg-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
  regulator: TI bq24022 Li-Ion Charger driver
  regulator: maintainers - add maintainers for regulator framework.
  regulator: documentation - ABI
  regulator: documentation - machine
  regulator: documentation - regulator driver
  regulator: documentation - consumer interface
  regulator: documentation - overview
  regulator: core kbuild files
  regulator: regulator test harness
  regulator: add support for fixed regulators.
  regulator: regulator framework core
  regulator: fixed regulator interface
  regulator: machine driver interface
  regulator: regulator driver interface
  regulator: consumer device interface