linux.git - Andy Grover's kernel tree

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge git://git.infradead.org/users/cbou/battery-urgent	Anton Vorontsov	2012-01-10	1	-1/+1
\|\
\| *	collie_battery: Get rid of irq_to_gpio usage	Jochen Friedrich	2011-11-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since 9d08d5d77a355510c2f5657c86b0a4b25acfe72c, irq_to_gpio() is no longer available but still in use by collie_battery.c. As it's just for a debug message, just get rid of this call. Signed-off-by: Jochen Friedrich <jochen@scram.de> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
* \|	collie_battery: Convert to gpio_request_array() / gpio_free_array()	Axel Lin	2011-11-24	1	-40/+13
\|/ \| \| \| \| \| \| \|	As suggested by Igor Grinberg, this change make the implementation looks simpler. Signed-off-by: Axel Lin <axel.lin@gmail.com> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
*	power_supply: Don't use flush_scheduled_work()	Tejun Heo	2010-12-22	1	-7/+6
\| \| \| \| \| \| \| \| \| \| \|	flush_scheduled_work() is deprecated and scheduled to be removed. In battery drivers, the work can be canceled on probe failure and removal and should be flushed on suspend. Replace flush_scheduled_work() usages with direct cancels and flushes. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>
*	collie: add battery driver	Thomas Kunze	2009-11-27	1	-0/+418
	This driver is based on tosa_battery.c.