linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-04 02:52:12 -05:00

Files

Andres Salomon b294a290d2 Revert "power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL"

This reverts commit 8efe444038 and
4cbc76eadf.

Richard@laptop.org was apparently using CAPACITY_LEVEL for debugging
battery/EC problems, and was upset that it was removed.  This readds it.

Conflicts:

	Documentation/power_supply_class.txt

Signed-off-by: Andres Salomon <dilinger@collabora.co.uk>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

2009-07-01 02:44:03 +04:00

acpi

Merge branch 'bjorn-notify' into release

2009-06-24 01:22:20 -04:00

asm-generic

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

2009-06-23 11:34:24 -07:00

crypto

…

drm

drm: Fix shifts which were miscalculated when converting from bitfields.

2009-06-24 16:11:04 +10:00