summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-30 15:52:59 +0100
committerMark Brown <broonie@kernel.org>2015-08-30 15:52:59 +0100
commitb18fec9fe42846784e1744e6bd6c754751e1d172 (patch)
treea5c632e9378b0aa954a7e94bdd6cdc7bd7d6e9dd /sound
parent48997b9c03a80cadd14e0ed097f9594ff8454039 (diff)
parent64793047558781330a1d13b159a2bc9385bdf97f (diff)
parentc17633081a0dc4c9f8c28b7a77ac5b63a1780e49 (diff)
parent80deaf09cb3fb3939c1d2b84610ae411cd7c6001 (diff)
parent4caae9546d2cf7dbc7a12d451f847d7b58912bda (diff)
Merge remote-tracking branches 'asoc/topic/const', 'asoc/topic/cs35l32', 'asoc/topic/cs4265' and 'asoc/topic/cs42l52' into asoc-next