diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-21 06:33:06 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-21 06:33:06 -1000 |
| commit | e61cd5e2e36746e5a4e791b9232aed39bce52ded (patch) | |
| tree | 9a9ba4b291698f94e00aaedbe6e4c551d7a51f5a /net/ipv4/ipmr.c | |
| parent | 64a2f30a89a3c26a5152b09f4d390b9d91cab0cc (diff) | |
| parent | 9aa36876ddeb85dfb0bcf37be06bbdc62e954f16 (diff) | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm radeon fixes from Dave Airlie:
"One core fix, but mostly radeon fixes for s/r and big endian UVD
support, and a fix to stop the GPU being reset for no good reason, and
crashing people's machines."
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/radeon: update lockup tracking when scheduling in empty ring
drm/prime: Honor requested file flags when exporting a buffer
drm/radeon: fix UVD on big endian
drm/radeon: fix write back suspend regression with uvd v2
drm/radeon: do not try to uselessly update virtual memory pagetable
Diffstat (limited to 'net/ipv4/ipmr.c')
0 files changed, 0 insertions, 0 deletions