diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-14 05:32:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-14 05:32:16 +0100 |
| commit | c60f7d5a8e7c639de5d9dfe07e1e91d302d506e4 (patch) | |
| tree | c1d12d4963768232f3489f7dc5a6626ddd3d5fde /security/keys/keyring.c | |
| parent | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | Merge tag 'ttm-fixes-3.14-2014-03-12' of git://people.freedesktop.org/~thomas... (diff) | |
| download | linux-c60f7d5a8e7c639de5d9dfe07e1e91d302d506e4.tar.xz linux-c60f7d5a8e7c639de5d9dfe07e1e91d302d506e4.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Pretty minor set of fixes for radeon, ttm and vmwgfx. The ttm ones
are a regression and an oops seen on server chipsets"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/vmwgfx: Fix a surface reference corner-case in legacy emulation mode
drm/radeon/cik: properly set compute ring status on disable
drm/radeon/cik: stop the sdma engines in the enable() function
drm/radeon/cik: properly set sdma ring status on disable
drm/radeon: fix runpm disabling on non-PX harder
drm/ttm: don't oops if no invalidate_caches()
drm/ttm: Work around performance regression with VM_PFNMAP
Diffstat (limited to 'security/keys/keyring.c')
0 files changed, 0 insertions, 0 deletions