summaryrefslogtreecommitdiffstats
path: root/drivers/misc/sgi-gru/gruprocfs.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-11-04 16:05:43 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-11-04 16:05:43 +0100
commit91d3f9bacdb4950d2f79fe2ba296aa249f60d06c (patch)
tree3409f69ef76a28734a492af8803ea9653ee0b4a8 /drivers/misc/sgi-gru/gruprocfs.c
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff)
parentdrm/i915: Ironlake suspend/resume support (diff)
downloadlinux-91d3f9bacdb4950d2f79fe2ba296aa249f60d06c.tar.xz
linux-91d3f9bacdb4950d2f79fe2ba296aa249f60d06c.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: drm/i915: Ironlake suspend/resume support drm/i915: kill warning in intel_find_pll_g4x_dp drm/i915: update watermarks before enabling PLLs drm/i915: add FIFO watermark support for G4x drm/i915: quiet DP i2c init drm/i915: fix panel fitting filter coefficient select for Ironlake drm/i915: fix to setup display reference clock control on Ironlake drm/i915: Install a fence register for fbc on g4x drm/i915: save/restore BLC histogram control reg across suspend/resume drm/i915: Fix FDI M/N setting according with correct color depth drm/i915: disable powersave feature for Ironlake currently drm/i915: Fix render reclock availability detection. drm/i915: Save and restore the GM45 FBC regs on suspend and resume. drm/i915: Set the LVDS_BORDER when using LVDS scaling mode drm/i915: disable FBC for Pineview, fixing a boot hang.
Diffstat (limited to 'drivers/misc/sgi-gru/gruprocfs.c')
0 files changed, 0 insertions, 0 deletions