leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
a8fa94e0f2
linux/drivers/media/v4l2-core
History
Tejun Heo a8fa94e0f2 Merge branch 'master' into driver-core-next-test-merge-rc2 
da9846ae15 ("kernfs: make kernfs_deactivate() honor KERNFS_LOCKDEP
flag") in driver-core-linus conflicts with kernfs_drain() updates in
driver-core-next.  The former just adds the missing KERNFS_LOCKDEP
checks which are already handled by kernfs_lockdep() checks in
driver-core-next.  The conflict can be resolved by taking code from
driver-core-next.

Conflicts:
	fs/kernfs/dir.c
2014-02-10 19:34:30 -05:00
..
Kconfig [media] omap24xx/tcm825x: move to staging for future removal 2013-12-20 13:45:22 -02:00
Makefile [media] omap24xx/tcm825x: move to staging for future removal 2013-12-20 13:45:22 -02:00
tuner-core.c Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2013-11-18 15:50:07 -08:00
v4l2-async.c [media] v4l2-async: Don't use dynamic static allocation 2013-11-08 09:45:43 -02:00
v4l2-clk.c [media] V4L2: add v4l2-clock helpers to register and unregister a fixed-rate clock 2013-10-31 04:31:30 -02:00
v4l2-common.c media: core: Don't use i2c_client->driver 2013-10-03 22:28:23 +02:00
v4l2-compat-ioctl32.c [media] v4l2-core: remove support for obsolete VIDIOC_DBG_G_CHIP_IDENT 2013-06-21 10:46:44 -03:00
v4l2-ctrls.c [media] s5p-mfc: Add controls to set vp8 enc profile 2014-01-13 10:59:11 -02:00
v4l2-dev.c [media] media: v4l2-dev: fix video device index assignment 2014-01-27 21:42:42 -02:00
v4l2-device.c [media] v4l2-device: check if already unregistered 2013-06-21 11:00:51 -03:00
v4l2-dv-timings.c [media] v4l2-dv-timings: fix GTF calculation 2014-02-04 06:45:47 -02:00
v4l2-event.c [media] V4L: Add v4l2_event_subdev_unsubscribe() helper function 2013-02-05 15:04:55 -02:00
v4l2-fh.c [media] v4l, smiapp, smiapp-pll, adp1653: Update contact information 2012-11-21 13:34:50 -02:00
v4l2-ioctl.c [media] v4l2: move tracepoints to video_usercopy 2014-01-07 06:51:41 -02:00
v4l2-mem2mem.c [media] V4L: Add mem2mem ioctl and file operation helpers 2013-12-04 15:34:24 -02:00
v4l2-of.c [media] v4l: of: Drop endpoint node reference in v4l2_of_get_remote_port() 2013-12-18 06:26:20 -02:00
v4l2-subdev.c [media] v4l: Don't warn during link validation when encountering a V4L2 devnode 2012-11-22 12:09:49 -02:00
videobuf2-core.c [media] vb2: Check if there are buffers before streamon 2014-02-04 06:30:21 -02:00
videobuf2-dma-contig.c dma-buf: avoid using IS_ERR_OR_NULL 2014-02-07 14:21:09 -08:00
videobuf2-dma-sg.c Merge branch 'upstream-fixes' into patchwork 2013-12-13 05:04:00 -02:00
videobuf2-memops.c [media] v4l: vb2-dma-contig: let mmap method to use dma_mmap_coherent call 2012-11-25 17:20:25 -02:00
videobuf2-vmalloc.c [media] videobuf2: add gfp_flags 2013-03-21 13:17:51 -03:00
videobuf-core.c [media] v4l: Tell user space we're using monotonic timestamps 2012-12-21 11:20:51 -02:00
videobuf-dma-contig.c [media] Revert "[media] videobuf_vm_{open,close} race fixes" 2014-02-04 06:29:46 -02:00
videobuf-dma-sg.c [media] Revert "[media] videobuf_vm_{open,close} race fixes" 2014-02-04 06:29:46 -02:00
videobuf-dvb.c
videobuf-vmalloc.c [media] Revert "[media] videobuf_vm_{open,close} race fixes" 2014-02-04 06:29:46 -02:00