summaryrefslogtreecommitdiff
path: root/sound/isa/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-03-12 19:50:42 +0300
committerMark Brown <broonie@kernel.org>2018-03-12 19:50:42 +0300
commit2889312616aecf1a1153be0fab19206a6b1f768f (patch)
tree7bf8111a508a4d3999f83062662d9146ec0297da /sound/isa/Makefile
parent493ea0c8a6bdcdd014a5c586b91953960c7c9260 (diff)
parent59dd2a85040103e95b1c87b1b920d357ee91dada (diff)
parent31895662f9ba81e8ea9ef05abf8edcb29d4b9c18 (diff)
downloadlinux-2889312616aecf1a1153be0fab19206a6b1f768f.tar.xz
Merge remote-tracking branches 'regmap/topic/debugfs' and 'regmap/topic/mmio-clk' into regmap-next