summaryrefslogtreecommitdiff
path: root/sound/soc/pxa
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-04 20:57:09 +0000
committerMark Brown <broonie@kernel.org>2015-02-04 20:57:09 +0000
commitf238479b6bfee938127c12c5f876127c1e4e5283 (patch)
tree845283b0c0760ecad87c368401821c63182d829b /sound/soc/pxa
parent699994d07e42bfbad6fbb564632ee8ebf6927a15 (diff)
parenta465122ae388c4951d1b39ed0186e82c1f5bcfb0 (diff)
parentd883641f87a42cffcdbbdc664fce1def20ed02b6 (diff)
parentb5fbcbab50b4f8065666d3633f47722bf8969b34 (diff)
parentcf0efa1c71c86b3ba731b9f3bad37ea4ceee6fbe (diff)
Merge remote-tracking branches 'asoc/topic/bt-sco', 'asoc/topic/cs35l32', 'asoc/topic/cs42l52' and 'asoc/topic/cs42l56' into asoc-next