| commit | a76ef86455fd8d199d482acc402675e4dcbe58fe | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 23 10:46:56 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 23 10:46:56 2011 -0700 |
| tree | be02d77b7656ba27db3ed87faa5e4a9ee2b921ad | |
| parent | f70f97546800c5dfaf8c580db90df02c824a937a [diff] | |
| parent | 815efa1eab5b0c3e071e5d6df0cc2d7e0c7e6fd7 [diff] |
Merge git://git.infradead.org/users/cbou/battery-3.1 * git://git.infradead.org/users/cbou/battery-3.1: s3c-adc-battery: Fix compilation error due to missing header (module.h) max8997_charger: Needs module.h max8998_charger: Needs module.h