Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Jun 2009 22:23:51 +0000 (15:23 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Jun 2009 22:23:51 +0000 (15:23 -0700)
commitb87297fb405ef13cac375f202d114323b076a56d
treedee71f28b6e8b88668bc77b5c23fa7733f5e5916
parentb63254c71a46d7af2e3f00342b0592dfcd77b342
parent0e7ddf7eeeef5aea85412120539ab5369577faeb
Merge branch 'for-linus' of git://git./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.