https://github.com/torvalds/linux
Revision 16bb85bc12e7d0b066b1471185f3889cb1ceb382 authored by Linus Torvalds on 12 August 2010, 16:58:33 UTC, committed by Linus Torvalds on 12 August 2010, 16:58:33 UTC
* git://git.infradead.org/battery-2.6:
  intel_mid_battery: Fix battery scaling
  intel_mid_battery: Fix the argument order to intel_scu_ipc_command
  olpc_battery: Fix build failure caused by sysfs changes
  Add s3c-adc-battery driver
  Intel MID platform battery driver

Fix up trivial conflicts (battery drivers added from different branches)
in drivers/power/{Kconfig,Makefile}
2 parent s 4936a3b + f59f5bc
History
Tip revision: 16bb85bc12e7d0b066b1471185f3889cb1ceb382 authored by Linus Torvalds on 12 August 2010, 16:58:33 UTC
Merge git://git.infradead.org/battery-2.6
Tip revision: 16bb85b
File Mode Size
Documentation
arch
block
crypto
drivers
firmware
fs
include
init
ipc
kernel
lib
mm
net
samples
scripts
security
sound
tools
usr
virt
.gitignore -rw-r--r-- 936 bytes
.mailmap -rw-r--r-- 3.9 KB
COPYING -rw-r--r-- 18.3 KB
CREDITS -rw-r--r-- 91.8 KB
Kbuild -rw-r--r-- 2.4 KB
MAINTAINERS -rw-r--r-- 172.0 KB
Makefile -rw-r--r-- 50.5 KB
README -rw-r--r-- 17.0 KB
REPORTING-BUGS -rw-r--r-- 3.3 KB

README

back to top