greybus: Merge branch 'gregkh_work' into master
authorGreg Kroah-Hartman <greg@kroah.com>
Tue, 21 Oct 2014 06:37:44 +0000 (14:37 +0800)
committerGreg Kroah-Hartman <greg@kroah.com>
Tue, 21 Oct 2014 06:37:44 +0000 (14:37 +0800)
commitcc662399dc26740c522f4c10504f9e06e331f4a5
tree39450786abf72c3ce0d5d9bcc59b1d0de87942e6
parent98f4ab2df9b51356b48210188b4fbff41789acbb
parentc0855bfdd65dd5c100d5c63daab5897a117d8b49
greybus: Merge branch 'gregkh_work' into master

This pulls in the battery driver work I did there.
drivers/staging/greybus/battery-gb.c