diff options
author | Mark Brown <broonie@kernel.org> | 2015-04-12 18:49:03 (GMT) |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-04-12 18:49:03 (GMT) |
commit | 626761ad022c01450330c5774399b35d7fc7a0ac (patch) | |
tree | c4b7251998f4c319fa7a3b8604dfbc8341c9771a /sound | |
parent | b7af54a99218a110e6dcb8a1e9742d60d3c322c9 (diff) | |
parent | 02f51640fedb61ab17fcddbd6fdb40239a4f46d9 (diff) | |
parent | 967beb2e87771411e08467152e3d9f1c3ae73a67 (diff) | |
parent | 7f2c52afc02554f18db27242b62d4047bbd8df4c (diff) | |
download | linux-626761ad022c01450330c5774399b35d7fc7a0ac.tar.xz |
Merge remote-tracking branches 'asoc/topic/jack', 'asoc/topic/jz4740' and 'asoc/topic/kirkwood' into asoc-next