diff options
| author | Linus Torvalds <[email protected]> | 2015-03-14 21:54:25 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2015-03-14 21:54:25 +0000 |
| commit | 7cd9beb3387b6603d96c0f0238b5b5afacaf1c78 (patch) | |
| tree | ad7d7b8ec38de7745df1a09c38a02c55613c6fb3 /tools/perf/util/annotate.c | |
| parent | Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/... (diff) | |
| parent | Merge branch 'drm-fixes-4.0' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| download | kernel-7cd9beb3387b6603d96c0f0238b5b5afacaf1c78.tar.gz kernel-7cd9beb3387b6603d96c0f0238b5b5afacaf1c78.zip | |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"Misc i915, vmwgfx and radeon fixes along with a fix for one of those
recursive sleep mutex debug cases in the mst code"
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/vmwgfx: Fix an issue with the device losing its irq line on module unload
drm/vmwgfx: Correctly NULLify dma buffer pointer on failure
drm/vmwgfx: Reorder device takedown somewhat
drm/vmwgfx: Fix a couple of lock dependency violations
drm/radeon: drop setting UPLL to sleep mode
drm/radeon: fix wait to actually occur after the signaling callback
drm/i915: Prevent TLB error on first execution on SNB
drm/i915: Do both mt and gen6 style forcewake reset on ivb probe
drm/i915: Make WAIT_IOCTL negative timeouts be indefinite again
drm/i915: use in_interrupt() not in_irq() to check context
drm/mst: fix recursive sleep warning on qlock
drm: Don't assign fbs for universal cursor support to files
Diffstat (limited to 'tools/perf/util/annotate.c')
0 files changed, 0 insertions, 0 deletions
