diff options
| author | Linus Torvalds | 2013-04-10 02:41:26 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2013-04-10 02:41:26 +0200 |
| commit | 49b442caa4ed719aa7e2522cdd5c8abf8607b860 (patch) | |
| tree | dcc105e45ae1b7669302731a9e4574fb853b4128 /crypto | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | drm/mgag200: Index 24 in extended CRTC registers is 24 in hex, not decimal. (diff) | |
| download | kernel-qcow2-linux-49b442caa4ed719aa7e2522cdd5c8abf8607b860.tar.gz kernel-qcow2-linux-49b442caa4ed719aa7e2522cdd5c8abf8607b860.tar.xz kernel-qcow2-linux-49b442caa4ed719aa7e2522cdd5c8abf8607b860.zip | |
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