summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Vorontsov <anton@enomsg.org>2013-01-05 17:35:35 -0800
committerAnton Vorontsov <anton@enomsg.org>2013-01-05 17:35:35 -0800
commit86b1e8294e5b99cfe39f8b801d644317e108c7e5 (patch)
tree8481027b056197db888e51eae47a8f95931b84cb
parent240fbe2347f1bb58c45fe07fd7c1e5ed96e2e983 (diff)
parente3e71007b0e85cfb8203871d166f45ee9de0ea89 (diff)
downloadlinux-86b1e8294e5b99cfe39f8b801d644317e108c7e5.tar.bz2
Merge branch 'ab8500-from-Rajanikanth'
Conflicts: drivers/power/ab8500_bmdata.c
0 files changed, 0 insertions, 0 deletions