summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorLinus Torvalds2010-03-04 17:04:22 +0100
committerLinus Torvalds2010-03-04 17:04:22 +0100
commit1fae4cfb97302289bb5df6a8195eb28385d0b002 (patch)
treeb432ca0e5354297e19725c5d2089fbd9922a26d0 /init/main.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg... (diff)
parentpower_supply: bq27x00: fix voltage and current units (diff)
downloadkernel-qcow2-linux-1fae4cfb97302289bb5df6a8195eb28385d0b002.tar.gz
kernel-qcow2-linux-1fae4cfb97302289bb5df6a8195eb28385d0b002.tar.xz
kernel-qcow2-linux-1fae4cfb97302289bb5df6a8195eb28385d0b002.zip
Merge git://git.infradead.org/battery-2.6
* git://git.infradead.org/battery-2.6: power_supply: bq27x00: fix voltage and current units power_supply: bq27x00: add status and time properties power_supply: bq27x00: add BQ27500 support power_supply: bq27x00: fix temperature conversion power_supply: bq27x00: remove unused struct fields power_supply: bq27x00: remove double endian swap da9030_battery: fix spelling in comment wm97xx_battery: Clean up some warnings
Diffstat (limited to 'init/main.c')
0 files changed, 0 insertions, 0 deletions