Merge git://git.infradead.org/users/cbou/battery-2.6.33
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Feb 2010 22:06:15 +0000 (14:06 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Feb 2010 22:06:15 +0000 (14:06 -0800)
commit06a57f4f20d7bf7c3796abd541a7d400483a4596
tree86f7c7436a21e6c558b8e12948afb76872d56cf4
parentfd48d6c888eb3eb3c7e94a8880c6121893bd17b8
parent12b336a8b4ea8652372f88521bf55cef7f5d5283
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