summaryrefslogtreecommitdiff
path: root/drivers/acpi/battery.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2012-07-26 08:03:58 +0400
committerLen Brown <len.brown@intel.com>2012-07-26 08:03:58 +0400
commitec033d0a02901551346b9f43f8ff9bad51378891 (patch)
treef0ede8b29060a64ccb985be1983535f884fe00a7 /drivers/acpi/battery.c
parentfa7584e13ac8e6a306085bba0a931f3135f1d8c4 (diff)
parent819f1a64beb6c962218bd348a6f19aff718cde6c (diff)
parentf712c71f7b2b43b894d1e92e1b77385fcad8815f (diff)
parenta58e1150225cc9e554b76da5519b2bb5bb6e46ff (diff)
parent20ff51a36b2cd25ee7eb3216b6d02b68935435ba (diff)
parent1b0a0e9a15b976d91f3b5ae619c6a8964c2818eb (diff)
parent6edab08c24f9141d69cfa4683a0a027d86ab303e (diff)
parentc2f4191a9c4dbbb5c8bc7f2c0eb5023b97dd2a49 (diff)
parentf197ac13f6eeb351b31250b9ab7d0da17434ea36 (diff)
parent8eaa8d6ca27788aa23659082362a608c1fabcdfe (diff)
parentb9c7aff481f19dd655ae3ce6513817d625e2d47c (diff)
parentc3ae331d1c2fe25edfbece73fda0bb312445b636 (diff)
downloadlinux-ec033d0a02901551346b9f43f8ff9bad51378891.tar.xz
Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupled', 'cpuidle-tweaks', 'intel_idle-ivb', 'ost', 'red-hat-bz-772730', 'thermal', 'thermal-spear' and 'turbostat-v2' into release