diff options
author | Mark Brown <broonie@kernel.org> | 2015-01-26 14:29:58 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-01-26 14:29:58 +0300 |
commit | 88343ee38d7ae55e39cda74c5d137cb2c454e66c (patch) | |
tree | 79229726e196fdfe48c6c117125cda7ef1eca4b4 /include/uapi/linux/uinput.h | |
parent | 8a6dcddf4c4887057af7b6c981ed9309ad4a2a4b (diff) | |
parent | bdfbf2550d85b0e645a0bb9b3abd3b0a5448eacf (diff) | |
parent | 7ddfdb5c5a5b51bdd2cb749d8341d763b079d520 (diff) | |
parent | 8e3e36e87c9e624a30d31c576b839eed3ac8abf4 (diff) | |
parent | a30c188b0d2e32b18509a386ab9f2142de841dca (diff) | |
parent | 22ee76daddb87f88d2336d1b4737ef27c4f307ac (diff) | |
download | linux-88343ee38d7ae55e39cda74c5d137cb2c454e66c.tar.xz |
Merge remote-tracking branches 'asoc/fix/rt5677', 'asoc/fix/simple', 'asoc/fix/ts3a227e', 'asoc/fix/wm8904' and 'asoc/fix/wm8960' into asoc-linus