diff options
| author |   Anton Vorontsov <anton@enomsg.org> | 2013-01-05 17:35:35 -0800 |
|---|---|---|
| committer | Anton Vorontsov <anton@enomsg.org> | 2013-01-05 17:35:35 -0800 |
| commit | 86b1e8294e5b99cfe39f8b801d644317e108c7e5 (patch) | |
| tree | 8481027b056197db888e51eae47a8f95931b84cb /include/linux | |
| parent | Merge branch 'for-anton' of git://git.linaro.org/people/ljones/linux-3.0-ux500 (diff) | |
| parent | ab8500: Promote ab8500_fg probe before ab8500_btemp probe (diff) | |
Merge branch 'ab8500-from-Rajanikanth'
Conflicts:
drivers/power/ab8500_bmdata.c
Diffstat (limited to 'include/linux')
0 files changed, 0 insertions, 0 deletions