Google Git
Sign in
gem5 / arm / linux / 511f1cb6d426938fabf9c6d69ce4861b66ffd919
commit511f1cb6d426938fabf9c6d69ce4861b66ffd919[log] [tgz]
authorArnd Bergmann <arnd@arndb.de>Sat Mar 24 11:29:58 2012 +0000
committerArnd Bergmann <arnd@arndb.de>Sat Mar 24 11:29:58 2012 +0000
tree88fd9b5c15ccb42d5d582f83e87ce5d3f16127cb
parentf907ab06bb021bcb91d39c8d1b36536ebdb318fa [diff]
parent4992fa1fd425f1934f503ffa96b68e235b89db9a [diff]
Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into next/drivers

The pxa regulator branch removes the bq24022 driver, while a lot of
other regulator drivers got added in the regulator tree. This
resolves the trivial conflicts by merging in the regulator patches
that are already merged into v3.4.

Conflicts:
	drivers/regulator/Kconfig
	drivers/regulator/Makefile

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
tree: 88fd9b5c15ccb42d5d582f83e87ce5d3f16127cb
  1. arch/
  2. block/
  3. crypto/
  4. Documentation/
  5. drivers/
  6. firmware/
  7. fs/
  8. include/
  9. init/
  10. ipc/
  11. kernel/
  12. lib/
  13. mm/
  14. net/
  15. samples/
  16. scripts/
  17. security/
  18. sound/
  19. tools/
  20. usr/
  21. virt/
  22. .gitignore
  23. .mailmap
  24. COPYING
  25. CREDITS
  26. Kbuild
  27. Kconfig
  28. MAINTAINERS
  29. Makefile
  30. README
  31. REPORTING-BUGS