summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2014-06-1314-286/+670
|\
| * rbd: only set disk to read-only onceJosh Durgin2014-06-111-1/+1
| * rbd: move calls that may sleep out of spin lock rangeJosh Durgin2014-06-111-11/+18
| * rbd: add ioctl for rbdGuangliang Zhao2014-06-111-2/+60
| * ceph: use truncate_pagecache() instead of truncate_inode_pages()Yan, Zheng2014-06-071-2/+2
| * ceph: include time stamp in every MDS requestSage Weil2014-06-062-1/+9
| * rbd: fix ida/idr memory leakIlya Dryomov2014-06-061-0/+1
| * rbd: use reference counts for image requestsAlex Elder2014-06-061-0/+9
| * rbd: fix osd_request memory leak in __rbd_dev_header_watch_sync()Ilya Dryomov2014-06-061-38/+85
| * rbd: make sure we have latest osdmap on 'rbd map'Ilya Dryomov2014-06-061-3/+33
| * libceph: add ceph_monc_wait_osdmap()Ilya Dryomov2014-06-062-0/+29
| * libceph: mon_get_version request infrastructureIlya Dryomov2014-06-064-8/+128
| * libceph: recognize poolop requests in debugfsIlya Dryomov2014-06-061-2/+4
| * ceph: refactor readpage_nounlock() to make the logic clearerZhang Zhen2014-06-061-10/+7
| * mds: check cap ID when handling cap export messageYan, Zheng2014-06-061-1/+1
| * ceph: remember subtree root dirfrag's auth MDSYan, Zheng2014-06-061-1/+7
| * ceph: introduce ceph_fill_fragtree()Yan, Zheng2014-06-061-45/+84
| * ceph: handle cap import atomicallyYan, Zheng2014-06-061-45/+54
| * ceph: pre-allocate ceph_cap struct for ceph_add_cap()Yan, Zheng2014-06-063-79/+85
| * ceph: update inode fields according to issued capsYan, Zheng2014-06-063-57/+73
| * rbd: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERODuan Jiong2014-06-061-1/+1
| * ceph: queue vmtruncate if necessary when handing cap grant/revokeYan, Zheng2014-06-061-10/+16
| * ceph: remove useless ACL checkZhang Zhen2014-06-061-6/+0
| * ceph: ceph_get_parent() can be staticFengguang Wu2014-06-061-1/+1
* | Merge branch 'topic/omap3isp' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2014-06-1321-1745/+458
|\ \
| * | [media] omap3isp: Rename isp_buffer isp_addr field to dmaLaurent Pinchart2014-05-257-17/+17
| * | [media] omap3isp: Move to videobuf2Laurent Pinchart2014-05-256-1287/+109
| * | [media] v4l: vb2: Add a function to discard all DONE buffersLaurent Pinchart2014-05-252-0/+25
| * | [media] omap3isp: Cancel all queued buffers when stopping the video streamLaurent Pinchart2014-05-251-0/+2
| * | [media] omap3isp: Move buffer irqlist to isp_buffer structureLaurent Pinchart2014-05-253-21/+22
| * | [media] omap3isp: Move queue irqlock to isp_video structureLaurent Pinchart2014-05-255-27/+19
| * | [media] omap3isp: Move queue mutex to isp_video structureLaurent Pinchart2014-05-254-91/+86
| * | [media] omap3isp: queue: Don't build scatterlist for kernel bufferLaurent Pinchart2014-05-252-25/+7
| * | [media] omap3isp: Use the ARM DMA IOMMU-aware operationsLaurent Pinchart2014-05-255-61/+89
| * | [media] omap3isp: queue: Use sg_alloc_table_from_pages()Laurent Pinchart2014-05-251-14/+2
| * | [media] omap3isp: queue: Map PFNMAP buffers to deviceLaurent Pinchart2014-05-252-18/+23
| * | [media] omap3isp: queue: Fix the dma_map_sg() return value checkLaurent Pinchart2014-05-251-1/+1
| * | [media] omap3isp: queue: Allocate kernel buffers with dma_alloc_coherentLaurent Pinchart2014-05-252-32/+27
| * | [media] omap3isp: queue: Inline the ispmmu_v(un)map functionsLaurent Pinchart2014-05-251-32/+4
| * | [media] omap3isp: queue: Merge the prepare and sglist functionsLaurent Pinchart2014-05-252-104/+69
| * | [media] omap3isp: queue: Use sg_table structureLaurent Pinchart2014-05-252-74/+40
| * | [media] omap3isp: queue: Move IOMMU handling code to the queueLaurent Pinchart2014-05-253-83/+78
| * | [media] omap3isp: video: Set the buffer bytesused field at completion timeLaurent Pinchart2014-05-251-1/+4
| * | [media] omap3isp: ccdc: Use the DMA API for FPCLaurent Pinchart2014-05-252-24/+35
| * | [media] omap3isp: ccdc: Use the DMA API for LSCLaurent Pinchart2014-05-252-31/+29
| * | [media] omap3isp: stat: Use the DMA APILaurent Pinchart2014-05-252-72/+53
| * | [media] omap3isp: stat: Store sg table in ispstat_bufferLaurent Pinchart2014-05-252-11/+10
| * | [media] omap3isp: stat: Merge dma_addr and iommu_addr fieldsLaurent Pinchart2014-05-254-15/+11
| * | [media] omap3isp: stat: Share common code for buffer allocationLaurent Pinchart2014-05-251-60/+54
| * | [media] omap3isp: stat: Remove impossible WARN_ONLaurent Pinchart2014-05-251-2/+0