]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitfcccfde1e0b4eb8c8a5388d96ce9aa2e81277d2f
treebe02d77b7656ba27db3ed87faa5e4a9ee2b921ad
parent9c1a2fdfb737cbedbcdad36813fe35a8a45f1642
parent97e5b658105bd5748c4e4996e65eed3cf7fb0d92
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