Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-23 11:21:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
2f9e682d05
linux/drivers/media/pci/bt8xx
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
..
bt848.h
bt878.c media/bt8xx: Remove old powerpc cruft 2015-03-24 13:33:50 +11:00
bt878.h media/bt8xx: Remove old powerpc cruft 2015-03-24 13:33:50 +11:00
btcx-risc.c [media] btcx-risc: move to bt8xx 2014-12-23 10:13:19 -02:00
btcx-risc.h [media] btcx-risc: move to bt8xx 2014-12-23 10:13:19 -02:00
bttv-audio-hook.c
bttv-audio-hook.h
bttv-cards.c [media] bttv: Convert to generic TEA575x interface 2015-01-27 10:13:19 -02:00
bttv-driver.c [media] bttv: embed video_device 2015-04-08 06:45:12 -03:00
bttv-gpio.c [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
bttv-i2c.c Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2013-05-02 14:38:53 -07:00
bttv-if.c [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
bttv-input.c [media] rc-core: document the protocol type 2014-07-23 21:50:48 -03:00
bttv-risc.c [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
bttv-vbi.c [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
bttv.h [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
bttvp.h [media] bttv: embed video_device 2015-04-08 06:45:12 -03:00
dst_ca.c [media] bt8xx: just return 0 instead of using a var 2014-09-03 17:59:29 -03:00
dst_ca.h
dst_common.h
dst_priv.h
dst.c [media] bt8xx: make driver routines fit into its own namespcae 2014-05-23 19:48:12 -03:00
dvb-bt8xx.c Drivers: media: remove __dev* attributes. 2013-01-03 15:57:02 -08:00
dvb-bt8xx.h
Kconfig [media] bttv: Convert to generic TEA575x interface 2015-01-27 10:13:19 -02:00
Makefile [media] btcx-risc: move to bt8xx 2014-12-23 10:13:19 -02:00