summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-23 10:46:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-23 10:46:56 -0700
commita76ef86455fd8d199d482acc402675e4dcbe58fe (patch)
treebe02d77b7656ba27db3ed87faa5e4a9ee2b921ad /kernel
parentf70f97546800c5dfaf8c580db90df02c824a937a (diff)
parent815efa1eab5b0c3e071e5d6df0cc2d7e0c7e6fd7 (diff)
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions