diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-01-16 03:15:03 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2015-01-16 10:42:08 +0100 |
| commit | 4e87f2dd9bc258c85b2f3bb1a100b49927fbe6f3 (patch) | |
| tree | 96c82edf20e2c28e8fc4d97438d00e3b18b8afe9 /drivers/video/tegra/host/nvhost_intr.h | |
| parent | fe4c58c4b96a24aba8e27956e8158b3002723b17 (diff) | |
| parent | c7460e0d6afd754ebf5555477129579bc83c47b9 (diff) | |
Merge remote-tracking branch 'remotes/nvidia/l4t/l4t-r16-r2' into tegra-next
(tegra-l4t-r16-16.5)
Conflicts:
drivers/media/video/tegra_v4l2_camera.c
drivers/mmc/host/sdhci.c
drivers/watchdog/tegra_wdt.c
include/media/tegra_v4l2_camera.h
Diffstat (limited to 'drivers/video/tegra/host/nvhost_intr.h')
0 files changed, 0 insertions, 0 deletions