greybus: Merge branch 'gregkh_work' into master

This pulls in the battery driver work I did there.
This commit is contained in:
Greg Kroah-Hartman 2014-10-21 14:37:44 +08:00
commit cc662399dc