Linus Torvalds 433c24ed7f Merge git://git.infradead.org/battery-2.6 ... * git://git.infradead.org/battery-2.6: power_supply: Add driver for the PMU on WM831x PMICs ds2760_battery: Fix integer overflow for time_to_empty_now wm97xx_battery: Convert to dev_pm_ops wm97xx_battery: Use irq to detect charger state wm97xx_battery: Use platform_data wm97xx-core: Pass platform_data to battery ds2760_battery: implement set_charged() feature power_supply: get_by_name and set_charged functionality power_supply: EXPORT_SYMBOL cleanups ds2760_battery: add current_accum module parameter ds2760_battery: handle full_active_uAh == 0 case correctly ds2760_battery: add rated_capacity module parameter ds2760_battery: export more features ds2760_battery: delay power supply registration wm8350_power: Implement charge type property power_supply: Add a charge_type property, and use it for olpc driver olpc_battery: Add an 'error' sysfs device that displays raw errors Revert "power: remove POWER_SUPPLY_PROP_CAPACITY_LEVEL"		2009-09-23 10:11:08 -07:00
..
acpi	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2009-09-23 09:32:11 -07:00
asm-generic	Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-23 09:46:15 -07:00
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2009-09-11 09:38:37 -07:00
drm	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2009-09-21 08:10:09 -07:00
keys	RxRPC: Use uX/sX rather than uintX_t/intX_t types	2009-09-16 00:01:13 -07:00
linux	Merge git://git.infradead.org/battery-2.6	2009-09-23 10:11:08 -07:00
math-emu
media	V4L/DVB (13019): video: initial support for ADV7180	2009-09-19 00:53:39 -03:00
mtd
net	pkt_sched: Fix tx queue selection in tc_modify_qdisc	2009-09-15 02:53:07 -07:00
pcmcia	pcmcia: Use phys_addr_t for physical addresses	2009-09-15 10:17:15 -07:00
rdma	trivial: fix typo "to to" in multiple files	2009-09-21 15:14:55 +02:00
rxrpc
scsi	trivial: remove unnecessary semicolons	2009-09-21 15:14:58 +02:00
sound	Merge branch 'topic/ymfpci' into for-linus	2009-09-10 15:33:09 +02:00
trace	Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-23 09:46:15 -07:00
video	davinci-fb-frame-buffer-driver-for-ti-da8xx-omap-l1xx-v4	2009-09-23 07:39:51 -07:00
xen
Kbuild