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)
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Trivial merge