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)
commit913272b3864d6da89c70d9fc2c30ccb57794b369
tree4fb0a8ab1b53623d2a8ea200b80a3ace2d271471
parent6cfc2a23540667cff6da6e41d1f1167a9a45aa9a
parent629bcb4b72d49b3631ae3dd0fe1d345820fadfcc
Merge git://git.infradead.org/users/cbou/battery-urgent
drivers/power/collie_battery.c