diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-06 12:16:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-06 12:16:49 -0700 |
| commit | de3796e77a587b28f0c9d8e04c02894d3939dc4e (patch) | |
| tree | f5a414a421e45e7f90c113aaf3ef30e078672f46 /MAINTAINERS | |
| parent | bcb65a797eb7c51e4f227dd19295f14d38738fee (diff) | |
| parent | 98c32bcded0e249fd48726930ae9f393e0e318b4 (diff) | |
| download | linux-3.10-de3796e77a587b28f0c9d8e04c02894d3939dc4e.tar.gz linux-3.10-de3796e77a587b28f0c9d8e04c02894d3939dc4e.tar.bz2 linux-3.10-de3796e77a587b28f0c9d8e04c02894d3939dc4e.zip | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (46 commits)
[media] rc: call input_sync after scancode reports
[media] imon: allow either proto on unknown 0xffdc
[media] imon: auto-config ffdc 7e device
[media] saa7134: fix raw IR timeout value
[media] rc: fix ghost keypresses with certain hw
[media] [staging] lirc_serial: allocate irq at init time
[media] lirc_zilog: fix spinning rx thread
[media] keymaps: fix table for pinnacle pctv hd devices
[media] ite-cir: 8709 needs to use pnp resource 2
[media] V4L: mx1-camera: fix uninitialized variable
[media] omap_vout: Added check in reqbuf & mmap for buf_size allocation
[media] OMAP_VOUT: Change hardcoded device node number to -1
[media] OMAP_VOUTLIB: Fix wrong resizer calculation
[media] uvcvideo: Disable the queue when failing to start
[media] uvcvideo: Remove buffers from the queues when freeing
[media] uvcvideo: Ignore entities for terminals with no supported format
[media] v4l: Don't access media entity after is has been destroyed
[media] media: omap3isp: fix a potential NULL deref
[media] media: vb2: fix allocation failure check
[media] media: vb2: reset queued_count value during queue reinitialization
...
Fix up trivial conflict in MAINTAINERS as per Mauro
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ae563fad227..584bdb2fe54 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6733,6 +6733,7 @@ F: fs/fat/ VIDEOBUF2 FRAMEWORK M: Pawel Osciak <pawel@osciak.com> M: Marek Szyprowski <m.szyprowski@samsung.com> +M: Kyungmin Park <kyungmin.park@samsung.com> L: linux-media@vger.kernel.org S: Maintained F: drivers/media/video/videobuf2-* |