summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Courbot <acourbot@nvidia.com>2015-11-11 18:55:26 +0900
committerAlexandre Courbot <acourbot@nvidia.com>2015-11-11 18:55:26 +0900
commitae907b00ded85f7be6213d6c54e82d13dc384823 (patch)
tree36f0a0bf59496397a3ed9eaffc1052f9cdccca8b
parent35f3748dcd99e5a3c96efa82ca46fbe260e98e68 (diff)
parentac5b5d8a3136e14c44e30f1e5a2574133be35dbe (diff)
parente7e542f3199e721e3ffa0b96ebe84a862e87f7ed (diff)
parentf41004eac7038118a98c1e9f898a43c47d2e4cc0 (diff)
downloadnouveau-baserock/tegra/4.2.tar.gz
Merge branches 'staging/fixes', 'staging/gm20b_clk', 'staging/ioctls' and 'staging/secure_boot' into staging/workbaserock/tegra/4.2