diff options
author | Mark Brown <broonie@linaro.org> | 2014-06-03 11:39:44 +0200 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-06-03 11:39:44 +0200 |
commit | dd7a7bb50cb5b5166a562a883f149ee4721c9c63 (patch) | |
tree | 3df8d4ceb7487820621dccf194d4c6cc6ae46d66 /drivers/video/fbdev/omap2/displays-new/Kconfig | |
parent | Merge remote-tracking branch 'asoc/topic/core' into asoc-next (diff) | |
parent | ASoC: Blackfin: ADAU1X81 eval board support (diff) | |
parent | ASoC: wm_adsp: Use adsp_err/warn instead of dev_err/warn (diff) | |
download | linux-dd7a7bb50cb5b5166a562a883f149ee4721c9c63.tar.xz linux-dd7a7bb50cb5b5166a562a883f149ee4721c9c63.zip |
Merge remote-tracking branches 'asoc/topic/adau' and 'asoc/topic/adsp' into asoc-next