From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 Sep 2010 19:55:44 +0000 (-0700)
Subject: Merge git://git.infradead.org/users/cbou/battery-2.6.36
X-Git-Tag: v2.6.36-rc5~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=de109c9868cf78a172ae580a83bf9a3a74a9b4bd;p=thirdparty%2Flinux.git

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
---

de109c9868cf78a172ae580a83bf9a3a74a9b4bd