diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-19 09:09:11 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-08-19 09:09:11 -0700 |
| commit | fbf21849edaf0cd2a9b33307ab965757a93b8d75 (patch) | |
| tree | 3fb2bfef9f04c2643feef507359cd5ca6d58d039 /include/linux/if_pppol2tp.h | |
| parent | 2203547f82b7727e2cd3fee3e56fceae2b2b691c (diff) | |
| parent | 3387ed83943daf6cb1bb4195ae369067b9cd80ce (diff) | |
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 'include/linux/if_pppol2tp.h')
0 files changed, 0 insertions, 0 deletions