Merge branch 'master' into for-next
[firefly-linux-kernel-4.4.55.git] / drivers / media / mmc / Makefile
1 obj-y += siano/