diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2016-01-18 18:19:22 +0900 |
---|---|---|
committer | Alexandre Courbot <acourbot@nvidia.com> | 2016-01-18 18:19:22 +0900 |
commit | 3d8d0e6b2c0725f1779775bf37b4a96959543c03 (patch) | |
tree | 018d474911e2419f964a58c9c7985fbbc91bc1df /drm/nouveau/dispnv04/dac.c | |
parent | 35d84b3b3cc604ec4ba1ab1f81a1f050ea2f5c20 (diff) | |
parent | 5d664a832ff18734e702eba1c2c070c23290fd68 (diff) | |
parent | 77282355433b9b607ecaad9befd2d5f953edd1fc (diff) | |
parent | e5483ef345bd9bde417732f8d325819950b23f12 (diff) | |
download | nouveau-3d8d0e6b2c0725f1779775bf37b4a96959543c03.tar.gz |
Merge branches 'staging/fixes', 'staging/gm20b_clk', 'staging/ioctls' and 'staging/secure_boot' into staging/workbaserock/tegra/4.4