| commit | 02e7cce2bc3ac82b971d1efe489f23ca0b6e1d4a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 27 09:22:55 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Jul 27 09:22:55 2010 -0700 |
| tree | 8a2579a63dafc1e7a47c0d9281e315dd6d9568d7 | |
| parent | a376bca61096c7a79393e8125b7ad4757ccff19c [diff] | |
| parent | eb9650d6d989f24f21232a055d8fd45f1a9dcf99 [diff] |
Merge git://git.infradead.org/users/cbou/battery-2.6.35 * git://git.infradead.org/users/cbou/battery-2.6.35: ds2782_battery: Rename get_current to fix build failure / name conflict