aboutsummaryrefslogtreecommitdiff
path: root/sound/soc/intel/atom/sst-atom-controls.c
diff options
context:
space:
mode:
authorMark Brown2015-08-30 15:54:38 +0100
committerMark Brown2015-08-30 15:54:38 +0100
commit373e515d655086d4c05aae3b098bd48fe1f0c382 (patch)
tree3b7222f86f2ec7e71aabb7dbe2d4109665a7f639 /sound/soc/intel/atom/sst-atom-controls.c
parent246647ee3e7533362e2c291eebaa7409b8565376 (diff)
parente1d46d30d133e7909e7dde06a4e867225c7e079b (diff)
parentc4a42915d84ad4b5b5e13aeed5da67f458e22399 (diff)
parent6f4397949689d74c3bd0016c80d59a90c6e8afee (diff)
parent04b5cbd80af899c6a4d51835b069b96ae8864e5a (diff)
parentf102aa1414d9aa28491414cf4103bad1ddb3ea1f (diff)
Merge remote-tracking branches 'asoc/topic/intel', 'asoc/topic/kirkwood', 'asoc/topic/lm49453', 'asoc/topic/max9768' and 'asoc/topic/max98088' into asoc-next