summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-01-11 16:54:34 +0300
committerMark Brown <broonie@kernel.org>2016-01-11 16:54:34 +0300
commite72ceb2aca268af62384bd5c0fc7afdf678d49ec (patch)
treefdecaa1c03c03f21f63f172ff308b1b2d48075ab /sound
parent188bdf726877fb27530934baea90876dfc2012ba (diff)
parent7905f08247131ac5d5c0e2f057e0cf19da40e5da (diff)
parentbb18f0976ef8db41f68b66623ce3b8a745adb0b8 (diff)
downloadlinux-e72ceb2aca268af62384bd5c0fc7afdf678d49ec.tar.xz
Merge remote-tracking branches 'asoc/topic/bcm2835' and 'asoc/topic/cleanup' into asoc-next