summaryrefslogtreecommitdiffstats
path: root/kernel/events/core.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-08 09:12:21 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-08 09:12:21 -0700
commit03d8f5408235bfd2781142458e0c0671530e74e7 (patch)
treed358f08d428577a150687f04a34ec425e90b5008 /kernel/events/core.c
parentb1e25f41094dfe0b9653c926d3c02a35c2eb249c (diff)
parent2d5c7cd35f1addb812e0b1709b3c727f1a58ca9c (diff)
downloadlinux-03d8f5408235bfd2781142458e0c0671530e74e7.tar.gz
linux-03d8f5408235bfd2781142458e0c0671530e74e7.tar.xz
linux-03d8f5408235bfd2781142458e0c0671530e74e7.zip
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm intel and exynos fixes from Dave Airlie: "A bunch of fixes for Intel and exynos, nothing too major, a new intel PCI ID, and a fix for CRT detection." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/i915: pch_irq_handler -> {ibx, cpt}_irq_handler char/agp: add another Ironlake host bridge drm/i915: fix up ivb plane 3 pageflips drm/exynos: fixed blending for hdmi graphic layer drm/exynos: Remove dummy encoder get_crtc operation implementation drm/exynos: Keep a reference to frame buffer GEM objects drm/exynos: Don't cast GEM object to Exynos GEM object when not needed drm/exynos: DRIVER_BUS_PLATFORM is not a driver feature drm/exynos: fixed size type. drm/exynos: Use DRM_FORMAT_{NV12, YUV420} instead of DRM_FORMAT_{NV12M, YUV420M} drm/i915: hold forcewake around ring hw init drm/i915: Mark the ringbuffers as being in the GTT domain drm/i915/crt: Do not rely upon the HPD presence pin drm/i915: Reset last_retired_head when resetting ring
Diffstat (limited to 'kernel/events/core.c')
0 files changed, 0 insertions, 0 deletions