diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-24 17:08:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-24 17:08:48 -0800 |
| commit | 4662db446190ddef8fbab024f72dee77dd04b8f2 (patch) | |
| tree | 404eb2b1276841298c29a7bd485f23e52fa58b8b /fs/fuse/fuse_i.h | |
| parent | 86e2fe9ff3f3eebca2066bcfc2d993f61af787f5 (diff) | |
| parent | 3c0556e9673f79e386b27768e27d18b3ce29e40e (diff) | |
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm/i915: Fix unintended recursion in ironlake_disable_rc6
drm/i915: fix corruptions on i8xx due to relaxed fencing
drm/i915: skip FDI & PCH enabling for DP_A
agp/intel: Experiment with a 855GM GWB bit
drm/i915: don't enable FDI & transcoder interrupts after all
drm/i915: Ignore a hung GPU when flushing the framebuffer prior to a switch
Diffstat (limited to 'fs/fuse/fuse_i.h')
0 files changed, 0 insertions, 0 deletions