diff options
author | Mark Brown <broonie@kernel.org> | 2017-09-01 12:13:06 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2017-09-01 12:13:06 +0100 |
commit | 2e9ac12a00f1de285fc6fd77b9c9949b4bd7283f (patch) | |
tree | 9820f6aa1fffd0905d89de87764a86d2efba7ed1 /include | |
parent | 55eafeb5cdbd5d7440f5532ebf13d49edc66316b (diff) | |
parent | a728f56094e7cf60a1dc0642fe86901d1a4dfb4e (diff) | |
parent | a1150d40b219af1344f7bcc9b365dc5ec7bfbb65 (diff) | |
parent | c5efe232e09ef29cc2f9e8333a49dd8891366c22 (diff) | |
parent | 635eac1e54d82c59f621a0f38a9bffae50f150c7 (diff) | |
parent | 7d2993811a1e07cd128847f07f63aae66a78d14b (diff) | |
download | linux-2e9ac12a00f1de285fc6fd77b9c9949b4bd7283f.tar.bz2 |
Merge remote-tracking branches 'asoc/topic/simple', 'asoc/topic/spear', 'asoc/topic/sta32x', 'asoc/topic/stm32' and 'asoc/topic/sunxi' into asoc-next