summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-30 16:25:02 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-30 16:25:02 -0800
commit11d814a20166461358e1cefaf6bcd425698b8460 (patch)
treed9f182f0ca2ad2e9cc6fe5506fcb56dac1211ac7 /drivers/gpu/drm/i915/i915_drv.h
parentc290b2f2b0187b5cd840b2c2803107a0207ebc2f (diff)
parenta493f1a24a496711d96b91c4dc0a1bd35eb6954b (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB: Fix RCU lockdep splats IB/ipoib: Prevent hung task or softlockup processing multicast response IB/qib: Fix over-scheduling of QSFP work RDMA/cxgb4: Fix retry with MPAv1 logic for MPAv2 RDMA/cxgb4: Fix iw_cxgb4 count_rcqes() logic IB/qib: Don't use schedule_work()
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
0 files changed, 0 insertions, 0 deletions