This is Tegra's pull requests for v3.6.
Changes in V2:
* Split for-3.6/{fixes,soc} to remove their dependency.
* Split for-3.6/{dt,boards} to remove their dependency.
* Added example merge resolution branches for the conflicts when merging
the above pairs of branches.