aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-04 15:23:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-04 15:23:51 -0700
commitb87297fb405ef13cac375f202d114323b076a56d (patch)
treedee71f28b6e8b88668bc77b5c23fa7733f5e5916 /drivers/ide
parentb63254c71a46d7af2e3f00342b0592dfcd77b342 (diff)
parent0e7ddf7eeeef5aea85412120539ab5369577faeb (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.
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions