Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-19 02:21:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
79aa79342c
linux/drivers/media/dvb-core
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
..
demux.h [media] demux.h: Remove duplicated enum 2013-04-08 06:53:15 -03:00
dmxdev.c [media] dvb core: rename the media controller entities 2015-02-26 08:44:19 -03:00
dmxdev.h [media] remove include/linux/dvb/dmx.h 2012-10-19 07:29:17 -03:00
dvb_ca_en50221.c [media] DVB: Less function calls in dvb_ca_en50221_init() after error detection 2015-04-08 07:42:01 -03:00
dvb_ca_en50221.h
dvb_demux.c [media] media_tree: Fix spelling errors 2013-12-09 14:50:50 -02:00
dvb_demux.h [media] demux.h: Remove duplicated enum 2013-04-08 06:53:15 -03:00
dvb_filter.c
dvb_filter.h
dvb_frontend.c [media] dvb-frontend: remove a warning 2015-02-26 08:43:29 -03:00
dvb_frontend.h [media] dvb-frontend: add core support for tuner suspend/resume 2014-08-21 15:25:09 -05:00
dvb_math.c
dvb_math.h
dvb_net.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
dvb_net.h [media] dvb: push down ioctl lock in dvb_usercopy 2012-12-27 15:44:21 -02:00
dvb_ringbuffer.c [media] ngene: properly handle __user ptr 2014-09-08 10:00:52 -03:00
dvb_ringbuffer.h [media] ngene: properly handle __user ptr 2014-09-08 10:00:52 -03:00
dvb-usb-ids.h [media] WinFast DTV2000 DS Plus 2015-04-08 15:41:58 -03:00
dvbdev.c [media] dvbdev: use adapter arg for dvb_create_media_graph() 2015-03-02 11:25:38 -03:00
dvbdev.h [media] use a function for DVB media controller register 2015-03-02 11:29:39 -03:00
Kconfig
Makefile