From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Feb 2010 22:06:15 +0000 (-0800)
Subject: Merge git://git.infradead.org/users/cbou/battery-2.6.33
X-Git-Tag: firefly_0821_release~9833^2~3184
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=06a57f4f20d7bf7c3796abd541a7d400483a4596;p=firefly-linux-kernel-4.4.55.git

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

* git://git.infradead.org/users/cbou/battery-2.6.33:
  wm97xx_battery: Handle missing platform data gracefully
---

06a57f4f20d7bf7c3796abd541a7d400483a4596