diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-12 10:37:14 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-03-12 10:37:14 -0700 |
commit | c39ac49f23424086b43aceeace243f7a8bcc3ad8 (patch) | |
tree | 133ec03bfe4f99e4f548ff056999b7c4418d3d2b /security/keys | |
parent | 6d9431a7496947cba54fa3b4940ba6041029d5c1 (diff) | |
parent | 8698080ee092bdbd6ee2cd5e7f707ceea2812bd8 (diff) |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm nouveau fixes from Dave Airlie:
"This is just nouveau fixes from Ben, one fixes a nasty oops that some
Fedora people have been seeing, so I'd like to get it out of the way."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/nv50: use correct tiling methods for m2mf buffer moves
drm/nouveau: idle channel before releasing notify object
drm/nouveau: fix regression in vblanking
drm/nv50: encoder creation failure doesn't mean full init failure
Diffstat (limited to 'security/keys')
0 files changed, 0 insertions, 0 deletions