diff options
author | Anton Vorontsov | 2011-11-24 23:49:45 +0100 |
---|---|---|
committer | Anton Vorontsov | 2011-11-24 23:54:59 +0100 |
commit | 47f0ac2b0a8c7f26b513a2a18045219b030aedf1 (patch) | |
tree | 27f33a5c1e40ee2a494758c1da2e03e86a09e32c /drivers/power/max8997_charger.c | |
parent | intel_mid_battery: Handle Over Current gracefully (diff) | |
parent | Linux 3.1 (diff) | |
download | kernel-qcow2-linux-47f0ac2b0a8c7f26b513a2a18045219b030aedf1.tar.gz kernel-qcow2-linux-47f0ac2b0a8c7f26b513a2a18045219b030aedf1.tar.xz kernel-qcow2-linux-47f0ac2b0a8c7f26b513a2a18045219b030aedf1.zip |
Merge tag 'v3.1' from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git into master
Battery tree missed last merge window, so it became stale enough
so that patches no longer apply as people use pretty recent kernels.
Diffstat (limited to 'drivers/power/max8997_charger.c')
0 files changed, 0 insertions, 0 deletions