summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 19:49:03 +0100
committerMark Brown <broonie@kernel.org>2015-04-12 19:49:03 +0100
commit626761ad022c01450330c5774399b35d7fc7a0ac (patch)
treec4b7251998f4c319fa7a3b8604dfbc8341c9771a /sound
parentb7af54a99218a110e6dcb8a1e9742d60d3c322c9 (diff)
parent02f51640fedb61ab17fcddbd6fdb40239a4f46d9 (diff)
parent967beb2e87771411e08467152e3d9f1c3ae73a67 (diff)
parent7f2c52afc02554f18db27242b62d4047bbd8df4c (diff)
downloadlinux-626761ad022c01450330c5774399b35d7fc7a0ac.tar.bz2
Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/jz4740' and 'asoc/topic/kirkwood' into asoc-next