Skip to content
Commit a76ef864 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/users/cbou/battery-3.1 

* git://git.infradead.org/users/cbou/battery-3.1:
  s3c-adc-battery: Fix compilation error due to missing header (module.h)
  max8997_charger: Needs module.h
  max8998_charger: Needs module.h
parents f70f9754 815efa1e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment