summaryrefslogtreecommitdiff
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:52:21 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:52:21 +0100
commit21af1094385186a078a044f886a312511dcca04f (patch)
tree46320a27fe4a2abe4a4723f63043bdc0d93fbea9 /include/sound/soc.h
parent28becbd59c89cccf26b7539684105437fa77210e (diff)
parent93ec3a1ad5b86aef8ca90d2b149ded0f6bb689f5 (diff)
parent310398f5e4618e9a0f6fd0c4b152401daf06c215 (diff)
parentf8ea6cebcfa6499949392da71fc427567c9e5a0e (diff)
parentd90c6cc242045115c5c4973114cc93e1c20e2ea8 (diff)
parent56113f6e6f8d57d3c184544c6421422558a9988e (diff)
Merge remote-tracking branches 'asoc/topic/88pm860x', 'asoc/topic/ac97', 'asoc/topic/ak4542', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next