Merge git://git.infradead.org/users/cbou/battery-urgent
authorAnton Vorontsov <cbouatmailru@gmail.com>
Tue, 10 Jan 2012 16:55:11 +0000 (20:55 +0400)
committerAnton Vorontsov <cbouatmailru@gmail.com>
Tue, 10 Jan 2012 16:55:11 +0000 (20:55 +0400)
1  2 
drivers/power/collie_battery.c

Simple merge