| commit | 86b1e8294e5b99cfe39f8b801d644317e108c7e5 | [log] [tgz] |
|---|---|---|
| author | Anton Vorontsov <anton@enomsg.org> | Sat Jan 05 17:35:35 2013 -0800 |
| committer | Anton Vorontsov <anton@enomsg.org> | Sat Jan 05 17:35:35 2013 -0800 |
| tree | 8481027b056197db888e51eae47a8f95931b84cb | |
| parent | 240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983 [diff] | |
| parent | e3e71007b0e85cfb8203871d166f45ee9de0ea89 [diff] |
Merge branch 'ab8500-from-Rajanikanth' Conflicts: drivers/power/ab8500_bmdata.c