diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-19 18:09:11 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-19 18:09:11 +0200 |
commit | fbf21849edaf0cd2a9b33307ab965757a93b8d75 (patch) | |
tree | 3fb2bfef9f04c2643feef507359cd5ca6d58d039 /kernel/time/timekeeping_debug.c | |
parent | kernel: fix new kernel-doc warning in wait.c (diff) | |
parent | Merge tag 'drm-intel-fixes-2013-08-15' of git://people.freedesktop.org/~danve... (diff) | |
download | linux-fbf21849edaf0cd2a9b33307ab965757a93b8d75.tar.xz linux-fbf21849edaf0cd2a9b33307ab965757a93b8d75.zip |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Bit late with these, was under the weather for a a few days, nothing
too crazy:
Some radeon regression fixes, one intel regression fix, and one fix to
avoid a warn with i915 when used with dma-buf"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/i915: unpin backing storage in dmabuf_unmap
drm/radeon: fix WREG32_OR macro setting bits in a register
drm/radeon/r7xx: fix copy paste typo in golden register setup
drm/i915: Don't deref pipe->cpu_transcoder in the hangcheck code
drm/radeon: fix UVD message buffer validation
Diffstat (limited to 'kernel/time/timekeeping_debug.c')
0 files changed, 0 insertions, 0 deletions