aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-02-04 15:57:26 -0500
committerMark Brown <broonie@kernel.org>2015-02-04 15:57:26 -0500
commit16ca41c6cc904d7eb9e92afc5f576e375c314f90 (patch)
tree6d338e7eae8e86474f77895e43dad012624c2e23 /sound
parentdacff834fa20b213c258175b7745a55eb35ea5b3 (diff)
parent75aa88684d73ed00a38bfa14b9edfac18b2acae8 (diff)
parentb682d7baf11ab0d29d511632eb0195b5fa004295 (diff)
parent57b7068de5d0cca8ac6e21085b843c1bbd49d3f4 (diff)
Merge remote-tracking branches 'asoc/topic/wm8960', 'asoc/topic/wm8988' and 'asoc/topic/xtfpga' into asoc-next