Merge branch 'linus' into sched/core, to resolve conflicts
[pandora-kernel.git] / Documentation / devicetree / bindings / mipi /
drwxr-xr-x   ..
drwxr-xr-x - dsi
-rw-r--r-- 1002 nvidia,tegra114-mipi.txt