diff options
author | Mark Brown <broonie@linaro.org> | 2014-04-22 22:01:05 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-04-22 22:01:05 +0100 |
commit | 22e0c1428061dd28046c7138b75dbd77f73e4e5a (patch) | |
tree | 145903fcfec97b993f6cc334e0a0e25dddb6c798 /drivers/video/fbdev/uvesafb.c | |
parent | 31835046beba8890e34ea79ca7e5aa7811cbfa4a (diff) | |
parent | 8aaa414fadaec2b682168a5c937a3950a77956bf (diff) | |
parent | 4e17d2d33abe4b523f79fec037ef66ba93643f65 (diff) | |
parent | 2b21694f153a0df88dca7fb4ce04614ea7ff9dc2 (diff) | |
parent | 6ae6698276ca36f37afc2ad38054092021519ad4 (diff) |
Merge remote-tracking branches 'asoc/fix/alc5623', 'asoc/fix/cs42l52', 'asoc/fix/cs42l73' and 'asoc/fix/fsl-spdif' into asoc-linus