diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-15 08:41:47 (GMT) |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-15 08:41:47 (GMT) |
| commit | cc9263874b42bf98209dce0afe698b550648e770 (patch) | |
| tree | f0eafd344c501e420de06c2e0f29f2ae0e6a9a1b /crypto/salsa20_generic.c | |
| parent | 02bef8f98d26e9774b49c78a42b29b168e8876fc (diff) | |
| parent | fc93ff608b15ae32cde3006b7af860b59cac20ec (diff) | |
| download | linux-cc9263874b42bf98209dce0afe698b550648e770.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge because too many conflicts, and also we need to get at the
latest struct fence patches from Gustavo. Requested by Chris Wilson.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'crypto/salsa20_generic.c')
0 files changed, 0 insertions, 0 deletions