Merge git://git.infradead.org/users/cbou/battery-2.6.29
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Feb 2009 00:28:08 +0000 (16:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Feb 2009 00:28:08 +0000 (16:28 -0800)
commitb578f3fcca1e78624dfb5f358776e63711d7fda2
treec4cb5147207a78d751dd1a558653ea48b57b8444
parent507e2fbaaacb6f164b4125b87c5002f95143174b
parentccc9c8b91c2631da2cab46a6fcd9c3106dcb9abb
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