greybus: Merge branch 'master' into svc
authorGreg Kroah-Hartman <gregkh@google.com>
Thu, 30 Jul 2015 20:58:00 +0000 (13:58 -0700)
committerGreg Kroah-Hartman <gregkh@google.com>
Thu, 30 Jul 2015 20:58:00 +0000 (13:58 -0700)
Get the USB driver fixes in this branch to prevent oopses from happening
when the USB host driver protocol is found in a manifest.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Trivial merge