diff options
author | Mark Brown <broonie@kernel.org> | 2015-06-05 18:55:05 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-06-05 18:55:05 +0100 |
commit | 28bedc59469e869c1ed9c30384d61798d6c3eb5c (patch) | |
tree | 70d450ee955f9c35abc6b7df201f32e2c265dcf3 /include/uapi | |
parent | b5a8342c1d940e4b91df2d06904fdc00f3a131ac (diff) | |
parent | 932ae8809469770a07ce19d6967d2ce303befa08 (diff) | |
parent | 208ba89b402d4f63a1352ae289fb8428cb92e7ec (diff) | |
parent | 3d907cc30d072829b6682fda791005de5768f34e (diff) | |
parent | 2d52d172398249f523b24cff9b84aee4e7b8e1b6 (diff) | |
parent | 7a8c78675f3c81760cde8ef31a9fcb0cb9ace231 (diff) | |
download | op-kernel-dev-28bedc59469e869c1ed9c30384d61798d6c3eb5c.zip op-kernel-dev-28bedc59469e869c1ed9c30384d61798d6c3eb5c.tar.gz |
Merge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', 'asoc/topic/wm5100', 'asoc/topic/wm8741' and 'asoc/topic/wm8960' into asoc-next