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)
commitb86b64e9a7a9d8fa6fec85dd85974d7b356b76c7
tree1db696f54381734f05769c016e5e8fbabd944617
parent32574ff3e4360e7c98fe5b2d54afb652aca45a8d
parenta96493560cd16095fd00a936bfa9de8614bab842
greybus: Merge branch 'master' into svc

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>