diff options
| author | Linus Torvalds | 2011-04-28 00:17:52 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2011-04-28 00:17:52 +0200 |
| commit | 7fcaa9aaea48996ba308c047a381de7a17ce03b2 (patch) | |
| tree | aa66519921a9a6e56f5448d7630386565fd31c89 /Documentation/networking/can.txt | |
| parent | Linux 2.6.39-rc5 (diff) | |
| parent | [media] media: vb2: correct queue initialization order (diff) | |
| download | kernel-qcow2-linux-7fcaa9aaea48996ba308c047a381de7a17ce03b2.tar.gz kernel-qcow2-linux-7fcaa9aaea48996ba308c047a381de7a17ce03b2.tar.xz kernel-qcow2-linux-7fcaa9aaea48996ba308c047a381de7a17ce03b2.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: (42 commits)
[media] media: vb2: correct queue initialization order
[media] media: vb2: fix incorrect v4l2_buffer->flags handling
[media] s5p-fimc: Add support for the buffer timestamps and sequence
[media] s5p-fimc: Fix bytesperline and plane payload setup
[media] s5p-fimc: Do not allow changing format after REQBUFS
[media] s5p-fimc: Fix FIMC3 pixel limits on Exynos4
[media] tda18271: update tda18271c2_rf_cal as per NXP's rev.04 datasheet
[media] tda18271: update tda18271_rf_band as per NXP's rev.04 datasheet
[media] tda18271: fix bad calculation of main post divider byte
[media] tda18271: prog_cal and prog_tab variables should be s32, not u8
[media] tda18271: fix calculation bug in tda18271_rf_tracking_filters_init
[media] omap3isp: queue: Don't corrupt buf->npages when get_user_pages() fails
[media] v4l: Don't register media entities for subdev device nodes
[media] omap3isp: Don't increment node entity use count when poweron fails
[media] omap3isp: lane shifter support
[media] omap3isp: ccdc: support Y10/12, 8-bit bayer fmts
[media] media: add missing 8-bit bayer formats and Y12
[media] v4l: add V4L2_PIX_FMT_Y12 format
cx23885: Fix stv0367 Kconfig dependency
[media] omap3isp: Use isp xclk defines
...
Fix up trivial conflict (spelink errurs) in drivers/media/video/omap3isp/isp.c
Diffstat (limited to 'Documentation/networking/can.txt')
0 files changed, 0 insertions, 0 deletions