summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/mpc5200_psc_ac97.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2014-11-18 15:25:56 +0000
committerMark Brown <broonie@kernel.org>2014-11-18 15:25:56 +0000
commit92eb0d546536602a5c334ec308b3e9bb7daa9927 (patch)
tree24848ef270db51d95e7ae1af7f6004c4517756f0 /sound/soc/fsl/mpc5200_psc_ac97.c
parent6ce13d61dc6cfc3cf6be6bd12faf75bfbc12ea91 (diff)
parentd7cabb08ba23c87757fb3be01e82f755aad426d1 (diff)
parentcf1f2ebe8d6176de80ef9d9c979f998ec38fb265 (diff)
Merge branches 'topic/ad1980', 'topic/wm9705' and 'topic/wm971x' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-ac97