greybus: Merge branch 'master' into svc to keep it up to date.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2015-07-30 12:21:33 -07:00
commit fff494340e