From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Aug 2011 17:46:56 +0000 (-0700)
Subject: Merge git://git.infradead.org/users/cbou/battery-3.1
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a76ef86455fd8d199d482acc402675e4dcbe58fe;p=linux.git

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
---

a76ef86455fd8d199d482acc402675e4dcbe58fe