greybus: Merge branch 'master' into vibrator-gb
authorGreg Kroah-Hartman <greg@kroah.com>
Tue, 18 Nov 2014 20:54:35 +0000 (12:54 -0800)
committerGreg Kroah-Hartman <greg@kroah.com>
Tue, 18 Nov 2014 20:54:35 +0000 (12:54 -0800)

Trivial merge