diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-04 15:23:51 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-04 15:23:51 -0700 |
commit | b87297fb405ef13cac375f202d114323b076a56d (patch) | |
tree | dee71f28b6e8b88668bc77b5c23fa7733f5e5916 /include/linux/tracehook.h | |
parent | Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 (diff) | |
parent | drm/i915: Remove a bad BUG_ON in the fence management code. (diff) | |
download | linux-dev-b87297fb405ef13cac375f202d114323b076a56d.tar.xz linux-dev-b87297fb405ef13cac375f202d114323b076a56d.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: Remove a bad BUG_ON in the fence management code.
Diffstat (limited to 'include/linux/tracehook.h')
0 files changed, 0 insertions, 0 deletions