greybus: Merge branch 'master' into svc
authorGreg Kroah-Hartman <gregkh@google.com>
Tue, 11 Aug 2015 00:29:12 +0000 (17:29 -0700)
committerGreg Kroah-Hartman <gregkh@google.com>
Tue, 11 Aug 2015 00:29:12 +0000 (17:29 -0700)
commit76ecf73ee4e3f15db202e4ea76816f155c478051
tree057c0031996b65cdaa46532260273cf4ea327af5
parent03cb4fa92ae76cebdb519c92fd3839ac291eac0f
parent782c3b732889b5fbce796a4b548d47a43e4d8c42
greybus: Merge branch 'master' into svc

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