tree c4cb5147207a78d751dd1a558653ea48b57b8444
parent 507e2fbaaacb6f164b4125b87c5002f95143174b
parent ccc9c8b91c2631da2cab46a6fcd9c3106dcb9abb
author Linus Torvalds <torvalds@linux-foundation.org> 1234398488 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1234398488 -0800

Merge git://git.infradead.org/users/cbou/battery-2.6.29

* git://git.infradead.org/users/cbou/battery-2.6.29:
  pcf50633_charger: Fix typo