diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-30 15:52:41 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-30 15:52:41 +0100 |
commit | 48997b9c03a80cadd14e0ed097f9594ff8454039 (patch) | |
tree | 25311569fed58446544e4f12392d5f89ff614630 /sound/soc/codecs/wm8997.c | |
parent | 21af1094385186a078a044f886a312511dcca04f (diff) | |
parent | fd63542fc5492b86158dbd53ce5de764f171b1b6 (diff) | |
parent | 054bc835d27b558393541c32a209c01d89cda75a (diff) | |
parent | c4d2ab0d59f53a1534e6817b5dbd28719f667c39 (diff) | |
parent | 54d8697fa5036df0e27f8d62edb7ebc35c3f73d6 (diff) | |
download | linux-48997b9c03a80cadd14e0ed097f9594ff8454039.tar.bz2 |
Merge remote-tracking branches 'asoc/topic/au1x', 'asoc/topic/bcm2835', 'asoc/topic/blackfin' and 'asoc/topic/card' into asoc-next