summaryrefslogtreecommitdiff
path: root/sound/soc/sh
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-12-08 13:12:02 +0000
committerMark Brown <broonie@kernel.org>2014-12-08 13:12:02 +0000
commit41967b775e14a123131a842edd46f284e3642816 (patch)
tree77d6f4cd0bc547b97be3ce9adce41ecf6f72a32d /sound/soc/sh
parentaddaeea9ee1979b033878a26b18d86ee9b90143e (diff)
parent0b5155bbca8b5a8a1456ae462a47eeaedf8ce091 (diff)
parent24445f8c5eae926e402335bbe0292f09b1deb7a7 (diff)
parent0db5dc943e7649bbfbc2d2de8f5cb778b05ea5bd (diff)
parent46804120c59b1374f8beb2b8636ffe6b0a7c16c8 (diff)
parent1679b532870f565bc184434f545cdbd3fdeff6cf (diff)
Merge remote-tracking branches 'asoc/topic/max98088', 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/max9850' and 'asoc/topic/mop500' into asoc-next