summaryrefslogtreecommitdiff
path: root/drivers/media/v4l2-core/videobuf-dma-contig.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-02-07 12:35:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-02-07 12:35:56 -0800
commit41f76d8bee06be5a9b301ebf13f61a719ba548c4 (patch)
treea582e83d1706b7f69ad6707f7102b5dd59e0fd60 /drivers/media/v4l2-core/videobuf-dma-contig.c
parent42be3f35a3ef0b64af80394afc5873aa5cf70871 (diff)
parent0ec1d15ec6ed513ab2cc86c67d94761d71228a32 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
Pull ceph fixes from Sage Weil: "There is an RBD fix for a crash due to the immutable bio changes, an error path fix, and a locking fix in the recent redirect support" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: libceph: do not dereference a NULL bio pointer libceph: take map_sem for read in handle_reply() libceph: factor out logic from ceph_osdc_start_request() libceph: fix error handling in ceph_osdc_init()
Diffstat (limited to 'drivers/media/v4l2-core/videobuf-dma-contig.c')
0 files changed, 0 insertions, 0 deletions