]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f70f975 815efa1)
Merge git://git.infradead.org/users/cbou/battery-3.1
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Aug 2011 17:46:56 +0000 (10:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Aug 2011 17:46:56 +0000 (10:46 -0700)
* 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


Trivial merge
Linux kernel for KaRo TX COM modules