projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4936a3b f59f5bc)
Merge git://git.infradead.org/battery-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 16:58:33 +0000 (09:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Aug 2010 16:58:33 +0000 (09:58 -0700)
commit16bb85bc12e7d0b066b1471185f3889cb1ceb382
tree88f7bb3ff052ea0e68d5416853d8fd68a508d8e7tree | snapshot (tar.gz zip)
parent4936a3b90d79dd8775c6ac23c2cf2dcebe29abdecommit | diff
parentf59f5bcb605f40d418aceb6f6047069435ffac72commit | diff
Merge git://git.infradead.org/battery-2.6

* 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}
drivers/power/Kconfig diff1 | diff2 | blob | history
drivers/power/Makefile diff1 | diff2 | blob | history