drivers/mmc/card/block.c: fix merge error
fix sound/soc/soc-dapm.c
fix merge error with drivers/mmc/core/core.c/h
Use bluetooth driver from Google's common 3.4 kernel