]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7fd3fce 1d22033)
Merge git://git.infradead.org/users/cbou/battery-2.6.36
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Sep 2010 19:55:44 +0000 (12:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Sep 2010 19:55:44 +0000 (12:55 -0700)
* 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


Trivial merge
Clone of davem's net-next-2.6 tree