diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-02 10:00:35 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-02 10:00:35 -0700 |
| commit | eba17e6868059849fc2ffa79aabdd5b59f229fb9 (patch) | |
| tree | 25c40aff5f46f9de63b331be410fda46a5dddbcb /drivers/gpu/drm/omapdrm/omap_gem.c | |
| parent | 1025c05f727be33e065bb502a223637681c7991d (diff) | |
| parent | c894e394d4b96a57964aac6fda9253d47bafbbf7 (diff) | |
Merge branch 'topic/input' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-cs42l51
Conflicts:
sound/soc/codecs/Kconfig
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_gem.c')
0 files changed, 0 insertions, 0 deletions