summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-10 15:08:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-10 15:08:40 -0700
commit3e7561636f3f7f9b2942f6f90b021fdaeb0fe0ee (patch)
tree45dcd63eb97b4cf59da2552865a2d395e5e3f849 /drivers/media/video/Makefile
parent04f2b9765f1e80337314e03c4adde695fe2f0403 (diff)
parent93fb72e443b9fcbef598faa05478883952edca77 (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/cxgb4: Obtain RDMA QID ranges from LLD/FW
Diffstat (limited to 'drivers/media/video/Makefile')
0 files changed, 0 insertions, 0 deletions