commit | 06a57f4f20d7bf7c3796abd541a7d400483a4596 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 11 14:06:15 2010 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Feb 11 14:06:15 2010 -0800 |
tree | 86f7c7436a21e6c558b8e12948afb76872d56cf4 | |
parent | fd48d6c888eb3eb3c7e94a8880c6121893bd17b8 [diff] | |
parent | 12b336a8b4ea8652372f88521bf55cef7f5d5283 [diff] |
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