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

Simple merge