leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6eb40d594b
linux/drivers/media/platform/soc_camera
History
Mauro Carvalho Chehab 64131a87f2 Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus 
* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
  media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
  hexdump: avoid warning in test function
  fs: take i_mutex during prepare_binprm for set[ug]id executables
  smp: Fix error case handling in smp_call_function_*()
  iommu-common: Fix PARISC compile-time warnings
  sparc: Make LDC use common iommu poll management functions
  sparc: Make sparc64 use scalable lib/iommu-common.c functions
  Break up monolithic iommu table/lock into finer graularity pools and lock
  sparc: Revert generic IOMMU allocator.
  tools/power turbostat: correct dumped pkg-cstate-limit value
  tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
  tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
  tools/power turbostat: Initial Skylake support
  tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
  tools/power turbostat: modprobe msr, if needed
  tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
  tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
  Bluetooth: hidp: Fix regression with older userspace and flags validation
  config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
  perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
  ...

That solves several merge conflicts:
	Documentation/DocBook/media/v4l/subdev-formats.xml
	Documentation/devicetree/bindings/vendor-prefixes.txt
	drivers/staging/media/mn88473/mn88473.c
	include/linux/kconfig.h
	include/uapi/linux/media-bus-format.h

The ones at subdev-formats.xml and media-bus-format.h are not trivial.
That's why we opted to merge from DRM.
2015-04-21 09:44:55 -03:00
..
atmel-isi.c [media] media: atmel-isi: increase the burst length to improve the performance 2015-03-02 13:27:11 -03:00
Kconfig [media] disable COMPILE_TEST for omap1_camera 2014-09-09 18:07:39 -03:00
Makefile [media] media: mx1_camera: Remove driver 2014-06-17 12:04:53 -03:00
mx2_camera.c [media] soc-camera: fix device capabilities in multiple camera host drivers 2015-01-21 21:05:45 -02:00
mx3_camera.c [media] soc_camera: use vb2_ops_wait_prepare/finish helper 2015-02-02 10:40:02 -02:00
omap1_camera.c [media] soc-camera: fix device capabilities in multiple camera host drivers 2015-01-21 21:05:45 -02:00
pxa_camera.c [media] soc-camera: fix device capabilities in multiple camera host drivers 2015-01-21 21:05:45 -02:00
rcar_vin.c [media] rcar-vin: Don't implement empty optional clock operations 2015-04-02 18:37:37 -03:00
sh_mobile_ceu_camera.c [media] soc_camera: use vb2_ops_wait_prepare/finish helper 2015-02-02 10:40:02 -02:00
sh_mobile_csi2.c [media] media: drop call to v4l2_device_unregister_subdev() 2015-03-03 11:21:41 -03:00
soc_camera_platform.c Driver core patches for 3.19-rc1 2014-12-14 16:10:09 -08:00
soc_camera.c Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus 2015-04-21 09:44:55 -03:00
soc_mediabus.c [media] platform: Make use of media_bus_format enum 2014-11-14 17:54:08 -02:00
soc_scale_crop.c [media] videodev2: Set vb2_rect's width and height as unsigned 2014-01-07 08:02:39 -02:00
soc_scale_crop.h [media] V4L2: soc-camera: move generic functions into a separate file 2013-06-28 15:03:16 -03:00