Merge remote-tracking branches 'asoc/topic/gpio' and 'asoc/topic/intel' into asoc...
authorMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:50 +0000 (10:39 +0100)
committerMark Brown <broonie@linaro.org>
Tue, 3 Jun 2014 09:39:50 +0000 (10:39 +0100)
commit9713d5d0c4d841c6a08bf2a0bd0728ff44f0c231
tree7ed4bbd01d1ba11f41aedaf48e81a37bdce94f8b
parent1ecf44503bc3287cb9e7b8661bffbfe225f14fea
parente667487b67d96fc2471529e3a5b404f51dc52b39
parentd8188f00e7f57412b5bb4405f636cb7c3d8f42a6
Merge remote-tracking branches 'asoc/topic/gpio' and 'asoc/topic/intel' into asoc-next
include/sound/soc.h
sound/soc/intel/byt-rt5640.c
sound/soc/intel/haswell.c
sound/soc/intel/sst-haswell-pcm.c