summaryrefslogtreecommitdiffstats
path: root/sound/ppc/snd_ps3.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-10-26 11:15:58 +0900
committerMark Brown <broonie@kernel.org>2015-10-26 11:15:58 +0900
commit2c218b7434205d2151118bd66832d73fb85e36ae (patch)
tree5ed8f9fbbe994cc6fe1f9dd93384729179b9c4fc /sound/ppc/snd_ps3.c
parent4cb803b8edf575641a372ba0ca433cd48deb3af2 (diff)
parent92b822a499607c32ce12ffd798a095babedc3202 (diff)
parent6ebbce0a6e15fd52ef029f780ec5fb3282fc22e3 (diff)
downloadlinux-2c218b7434205d2151118bd66832d73fb85e36ae.tar.bz2
Merge remote-tracking branches 'asoc/topic/ad193x' and 'asoc/topic/arizona' into asoc-next