diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-10 04:41:26 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-10 04:41:26 +0400 |
| commit | 49b442caa4ed719aa7e2522cdd5c8abf8607b860 (patch) | |
| tree | dcc105e45ae1b7669302731a9e4574fb853b4128 /crypto | |
| parent | e8f2b548de7ae65e17ee911e54712a3f26f69c60 (diff) | |
| parent | 1812a3db0874be1d1524086da9e84397b800f546 (diff) | |
| download | linux-49b442caa4ed719aa7e2522cdd5c8abf8607b860.tar.xz | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Just a spare semicolon in nouveau that caused some issues, and an
mgag200 fix"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/mgag200: Index 24 in extended CRTC registers is 24 in hex, not decimal.
drm/nouveau: fix unconditional return waiting on memory
Diffstat (limited to 'crypto')
0 files changed, 0 insertions, 0 deletions