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)
commitc3278f9f398c7160e9385c5795085cd0d19975d1
tree23ef966958d235af8b78aee797f2503b21ff27b2
parent4b992018da759ff471872a3483b03cb0a649b698
parentde80073a1768b0fb01df0e597225047fd66e8044
greybus: Merge branch 'master' into vibrator-gb