tree 8b555db133d85b19538c0c0ac555e999c91f166e
parent 7fd3fce3a0a103bd6367889023c930ce3292d56a
parent 1d220334d6a8a711149234dc5f98d34ae02226b8
author Linus Torvalds <torvalds@linux-foundation.org> 1284666944 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1284666944 -0700

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

* git://git.infradead.org/users/cbou/battery-2.6.36:
  apm_power: Add missing break statement
  intel_pmic_battery: Fix battery charging status on mrst