greybus: Merge branch 'master' into vibrator-gb

This commit is contained in:
Greg Kroah-Hartman 2014-11-18 12:54:35 -08:00
commit c3278f9f39
6 changed files with 164 additions and 149 deletions