aboutsummaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 17:38:31 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-13 17:38:31 -0500
commit122ce878dc189860a380539bde19498bf93443a7 (patch)
tree8414acd7b686ad4af6b16d0952823f07a12f2522 /include/drm
parentdaf9fe2ee9a203c4fc555cfe5c5f3d9f660e743c (diff)
parent0636b33c5f2fac4e274464ae6867805f080fc433 (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: RDMA/nes: Fix CX4 link problem in back-to-back configuration RDMA/nes: Clear stall bit before destroying NIC QP RDMA/nes: Set assume_aligned_header bit RDMA/cxgb3: Wait at least one schedule cycle during device removal IB/mad: Ignore iWARP devices on device removal IPoIB: Include return code in trace message for ib_post_send() failures IPoIB: Fix TX queue lockup with mixed UD/CM traffic
Diffstat (limited to 'include/drm')
0 files changed, 0 insertions, 0 deletions