diff options
author | Alexandre Courbot <acourbot@nvidia.com> | 2016-02-26 10:24:29 +0900 |
---|---|---|
committer | Alexandre Courbot <acourbot@nvidia.com> | 2016-02-26 10:24:29 +0900 |
commit | bd1d1f23b6b782d28aa703e48db9ce99d49a9a22 (patch) | |
tree | 0a0777a27a795b796ffe844a3dbf6139fdd373b4 | |
parent | ad8c03986d0a8fa34d2b7e45e3a4cd93f2416a73 (diff) | |
parent | 650c3761e6163fd681a392d49dbb97d8fa9a0bbb (diff) | |
parent | f6c973035af1fe8a612bc5bec2e8c267e75b2eda (diff) | |
parent | 14363433bd73ba28392d1ab7d22056b94712beab (diff) | |
download | nouveau-bd1d1f23b6b782d28aa703e48db9ce99d49a9a22.tar.gz |
Merge branches 'staging/drm-fixes', 'staging/fixes', 'staging/gm20b_clk' and 'staging/ioctls' into staging/work