| commit | b87297fb405ef13cac375f202d114323b076a56d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 04 15:23:51 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 04 15:23:51 2009 -0700 |
| tree | dee71f28b6e8b88668bc77b5c23fa7733f5e5916 | |
| parent | b63254c71a46d7af2e3f00342b0592dfcd77b342 [diff] | |
| parent | 0e7ddf7eeeef5aea85412120539ab5369577faeb [diff] |
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: Remove a bad BUG_ON in the fence management code.