1
0
Fork 0
alistair23-linux/include
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
keys
linux Revert "power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL" 2009-07-01 02:44:03 +04:00
math-emu
media V4L/DVB (11901): v4l2: Create helper function for bounding and aligning images 2009-06-23 03:21:18 -03:00
mtd Kill jffs2-user.h 2009-06-05 17:31:38 +01:00
net Phonet: publicize the Netlink notification function 2009-06-25 02:58:15 -07:00
pcmcia
rdma
rxrpc
scsi sd, sr: fix Driver 'sd' needs updating message 2009-06-21 12:01:27 -05:00
sound Merge branch 'topic/pcm-jiffies-check' into for-linus 2009-06-10 07:26:41 +02:00
trace ext4: convert instrumentation from markers to tracepoints 2009-06-17 11:48:11 -04:00
video fbdev: s1d13xxxfb: add accelerated bitblt functions 2009-06-16 19:48:00 -07:00
xen
Kbuild [SCSI] FC Pass Thru support 2009-06-12 14:20:05 -05:00