summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-04-09 17:41:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-09 17:41:26 -0700
commit49b442caa4ed719aa7e2522cdd5c8abf8607b860 (patch)
treedcc105e45ae1b7669302731a9e4574fb853b4128 /crypto
parente8f2b548de7ae65e17ee911e54712a3f26f69c60 (diff)
parent1812a3db0874be1d1524086da9e84397b800f546 (diff)
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