diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 12:01:28 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-05 12:01:28 +1100 |
| commit | 36753aaf7758b2089a55b3e67e6f1a9242462bb4 (patch) | |
| tree | bfd6874f09291896c6fa80fb3b2d373345245ddb /MAINTAINERS | |
| parent | 50b13b8ad191d05b610e18e30b03d02de10487d6 (diff) | |
| parent | 977386a04bae2a5a5092c965c92c7c4d36eed23f (diff) | |
Merge remote-tracking branch 'drm-tegra/drm/for-next'
Conflicts:
MAINTAINERS
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fdbfb964d7c0..0be26ec2b4fe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2849,7 +2849,9 @@ L: dri-devel@lists.freedesktop.org L: linux-tegra@vger.kernel.org T: git git://anongit.freedesktop.org/tegra/linux.git S: Supported +F: drivers/gpu/drm/tegra/ F: drivers/gpu/host1x/ +F: include/linux/host1x.h F: include/uapi/drm/tegra_drm.h F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt |