diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-06-21 15:37:37 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2018-06-21 15:37:37 +0200 |
| commit | e86ab6530fd4e461ae622b6c1ff72359952a7189 (patch) | |
| tree | fb387e644216e47c13da26c5dbecab6822714393 /drivers/media/i2c/soc_camera/Makefile | |
| parent | e81dd8a3500fea94ce8786554cbc29bc6b2a9207 (diff) | |
| parent | e78bb38b883c42edf81766a1d557aed74458e08f (diff) | |
Merge tag 'tegra-l4t-r21.7' into toradex_tk1_l4t_r21.7-next
Merge NVIDIA's latest Linux for Tegra aka L4T R21.7 Linux kernel changes
from git://nv-tegra.nvidia.com/linux-3.10.git commit:
e78bb38b883c42edf81766a1d557aed74458e08f
Conflicts involved missing 24-bit LVDS support and a single whitespace
aka tab difference in drivers/video/tegra/dc/sor.c.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Diffstat (limited to 'drivers/media/i2c/soc_camera/Makefile')
0 files changed, 0 insertions, 0 deletions