diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-30 15:58:18 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-30 15:58:18 +0100 |
| commit | c009d370dd35eb29a8c14f6eb50a4da4276db3f1 (patch) | |
| tree | a6d7222bafa62e0066944e45b4dfb76a3241f7ce /sound/soc/codecs/wm5100.c | |
| parent | 428157c1e8c9eaf0029430ae82ec0df8578de46b (diff) | |
| parent | 95e3c2305b79e9c0e5f2cb0090efca397249b51f (diff) | |
| parent | ef3355d22046f4b2c00b0fdf964d6c92fd3f050d (diff) | |
| parent | 4313489c25622b05adac55dbb9590fb5674c3f45 (diff) | |
| parent | 0a3dcb509ae7701ba3eaf470cad91827821daf41 (diff) | |
Merge remote-tracking branches 'asoc/topic/txx9', 'asoc/topic/uda134x', 'asoc/topic/ux500' and 'asoc/topic/width' into asoc-next