summaryrefslogtreecommitdiff
path: root/sound/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2017-11-11 00:31:02 +0300
committerMark Brown <broonie@kernel.org>2017-11-11 00:31:02 +0300
commit242f66c84533af20a20ecff4ea1b2c8c6a0f65ed (patch)
tree76f51d985829219569f8cca7fe5b6c576443e68f /sound/Makefile
parent357c59a98fec7267b5a247d49196b85637479dfd (diff)
parent6f8acad646d29fbf5665a6e0c9adae71c3c2131e (diff)
parentae9d1b5fbd7b7ee1c2d2f62a7cee3c0455e06f94 (diff)
parent31c45b3e8d0ecc3a5cbfbf3dfe18adeab2f17a48 (diff)
parent0340afe74d43e9c82bc0f5904d8f5b99d0fc3ab0 (diff)
downloadlinux-242f66c84533af20a20ecff4ea1b2c8c6a0f65ed.tar.xz
Merge remote-tracking branches 'asoc/topic/ac97', 'asoc/topic/ac97-mfd', 'asoc/topic/amd' and 'asoc/topic/arizona-mfd' into asoc-next