linux/drivers/media/dvb-frontends
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
..
drx39xyj dvb-frontends: use IS_REACHABLE() instead of IS_ENABLED() 2015-04-08 15:05:12 -03:00
a8293.c
a8293.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
af9013_priv.h
af9013.c
af9013.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
af9033_priv.h [media] af9033: fix DVBv3 snr value not correct issue 2014-11-04 18:20:35 -02:00
af9033.c [media] af0933: Don't go past arrays 2014-11-05 08:09:27 -02:00
af9033.h
as102_fe_types.h
as102_fe.c
as102_fe.h
atbm8830_priv.h
atbm8830.c
atbm8830.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
au8522_common.c
au8522_decoder.c
au8522_dig.c [media] au8522: improve lock performance with ZeeVee modulators 2014-11-03 12:25:28 -02:00
au8522_priv.h
au8522.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
bcm3510_priv.h
bcm3510.c
bcm3510.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
bsbe1-d01a.h
bsbe1.h
bsru6.h
cx22700.c [media] cx22700: Fix potential buffer overflow 2014-11-05 09:42:22 -02:00
cx22700.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
cx22702.c
cx22702.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
cx24110.c [media] cx24110: Simplify error handling at cx24110_set_fec() 2014-11-05 10:00:45 -02:00
cx24110.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
cx24113.c
cx24113.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
cx24116.c
cx24116.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
cx24117.c [media] cx24117: Grammar s/if ... if/if ... is/ 2014-12-04 13:57:24 -02:00
cx24117.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
cx24123.c
cx24123.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
cxd2820r_c.c media: cxd2820r: use DIV_ROUND_CLOSEST_ULL() 2015-04-17 09:03:56 -04:00
cxd2820r_core.c media: cxd2820r: use DIV_ROUND_CLOSEST_ULL() 2015-04-17 09:03:56 -04:00
cxd2820r_priv.h media: cxd2820r: use DIV_ROUND_CLOSEST_ULL() 2015-04-17 09:03:56 -04:00
cxd2820r_t2.c media: cxd2820r: use DIV_ROUND_CLOSEST_ULL() 2015-04-17 09:03:56 -04:00
cxd2820r_t.c media: cxd2820r: use DIV_ROUND_CLOSEST_ULL() 2015-04-17 09:03:56 -04:00
cxd2820r.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dib0070.c
dib0070.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dib0090.c
dib0090.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dib3000.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dib3000mb_priv.h
dib3000mb.c
dib3000mc.c
dib3000mc.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dib7000m.c
dib7000m.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dib7000p.c
dib7000p.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dib8000.c [media] dib8000: upd_demod_gain_period should be u32 2015-02-02 13:21:25 -02:00
dib8000.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dib9000.c
dib9000.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dibx000_common.c
dibx000_common.h
drxd_firm.c
drxd_firm.h
drxd_hard.c
drxd_map_firm.h
drxd.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
drxk_hard.c [media] DVB-frontends: Deletion of unnecessary checks before the function call "release_firmware" 2014-11-25 09:52:44 -02:00
drxk_hard.h
drxk_map.h
drxk.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
ds3000.c [media] ds3000: fix LNB supply voltage on Tevii S480 on initialization 2014-10-30 16:53:44 -02:00
ds3000.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dvb_dummy_fe.c
dvb_dummy_fe.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
dvb-pll.c
dvb-pll.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
ec100.c
ec100.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
eds1547.h
hd29l2_priv.h
hd29l2.c [media] hd29l2: fix sparse error and warnings 2014-12-23 10:42:51 -02:00
hd29l2.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
isl6405.c
isl6405.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
isl6421.c
isl6421.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
isl6423.c
isl6423.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
itd1000_priv.h
itd1000.c
itd1000.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
ix2505v.c
ix2505v.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
Kconfig [media] DVB: add support for LG Electronics LGDT3306A ATSC/QAM-B Demodulator 2015-03-03 10:34:08 -03:00
l64781.c
l64781.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
lg2160.c [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
lg2160.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
lgdt330x_priv.h [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
lgdt330x.c [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
lgdt330x.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
lgdt3305.c [media] lgdt3305: add support for fixed tp clock mode 2015-01-29 18:32:01 -02:00
lgdt3305.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
lgdt3306a.c [media] lgdt3306a: Minor source code cleanups 2015-03-03 10:34:15 -03:00
lgdt3306a.h dvb-frontends: use IS_REACHABLE() instead of IS_ENABLED() 2015-04-08 15:05:12 -03:00
lgs8gl5.c
lgs8gl5.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
lgs8gxx_priv.h
lgs8gxx.c
lgs8gxx.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
lnbh24.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
lnbp21.c
lnbp21.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
lnbp22.c
lnbp22.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
m88ds3103_priv.h [media] m88ds3103: add support for the demod of M88RS6000 2014-11-03 18:24:15 -02:00
m88ds3103.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2015-04-14 09:50:27 -07:00
m88ds3103.h
m88rs2000.c
m88rs2000.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
Makefile [media] DVB: add support for LG Electronics LGDT3306A ATSC/QAM-B Demodulator 2015-03-03 10:34:08 -03:00
mb86a16_priv.h
mb86a16.c
mb86a16.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
mb86a20s.c [media] mb86a20s: remove unused debug modprobe parameter 2015-01-26 10:08:29 -02:00
mb86a20s.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
mn88472.h [media] mn88472: add ts mode and ts clock to driver 2015-04-08 06:54:41 -03:00
mn88473.h [media] mn88473: calculate the IF register values 2015-03-03 13:07:55 -03:00
mt312_priv.h
mt312.c
mt312.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
mt352_priv.h
mt352.c
mt352.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
nxt200x.c
nxt200x.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
nxt6000_priv.h
nxt6000.c
nxt6000.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
or51132.c [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
or51132.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
or51211.c
or51211.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
rtl2830_priv.h [media] rtl2830: convert to regmap API 2015-02-03 15:59:19 -02:00
rtl2830.c [media] rtl2830: declare functions as static 2015-02-03 16:38:29 -02:00
rtl2830.h [media] rtl2830: add kernel-doc comments for platform_data 2015-02-03 16:30:26 -02:00
rtl2832_priv.h [media] rtl2832: implement own lock for regmap 2015-02-03 16:28:12 -02:00
rtl2832_sdr.c [media] rtl2832_sdr: refcount to rtl28xxu 2015-02-03 16:22:24 -02:00
rtl2832_sdr.h [media] rtl2832_sdr: add kernel-doc comments for platform_data 2015-02-03 16:31:01 -02:00
rtl2832.c Merge branch 'patchwork' into v4l_for_linus 2015-04-21 06:12:35 -03:00
rtl2832.h [media] rtl2832: add kernel-doc comments for platform_data 2015-02-03 16:30:47 -02:00
s5h1409.c [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
s5h1409.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
s5h1411.c [media] media: remove emacs editor variables 2014-12-22 17:52:20 -02:00
s5h1411.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
s5h1420_priv.h
s5h1420.c
s5h1420.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
s5h1432.c
s5h1432.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
s921.c
s921.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
si21xx.c
si21xx.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
si2165_priv.h
si2165.c [media] si2165: Fix possible leak in si2165_upload_firmware() 2015-04-08 08:12:00 -03:00
si2165.h dvb-frontends: use IS_REACHABLE() instead of IS_ENABLED() 2015-04-08 15:05:12 -03:00
si2168_priv.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2015-04-14 09:50:27 -07:00
si2168.c [media] si2168: add support for 1.7MHz bandwidth 2015-02-03 18:13:12 -02:00
si2168.h [media] si2168: rename few things 2015-01-29 18:41:49 -02:00
sp2_priv.h
sp2.c [media] sp2: Delete an unnecessary check before the function call "kfree" 2015-04-08 07:36:00 -03:00
sp2.h
sp887x.c
sp887x.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
sp8870.c
sp8870.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stb0899_algo.c [media] stb0899: use sign_extend32() for sign extension 2015-02-03 18:16:18 -02:00
stb0899_cfg.h
stb0899_drv.c [media] media: stb0899_drv: use time_after() 2015-01-27 09:55:28 -02:00
stb0899_drv.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stb0899_priv.h
stb0899_reg.h
stb6000.c
stb6000.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stb6100_cfg.h
stb6100_proc.h
stb6100.c
stb6100.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stv090x_priv.h
stv090x_reg.h
stv090x.c [media] stv090x: add an extra protetion against buffer overflow 2014-12-04 15:28:46 -02:00
stv090x.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stv0288.c
stv0288.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stv0297.c
stv0297.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stv0299.c
stv0299.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stv0367_priv.h
stv0367_regs.h
stv0367.c
stv0367.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stv0900_core.c
stv0900_init.h
stv0900_priv.h
stv0900_reg.h
stv0900_sw.c
stv0900.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stv6110.c
stv6110.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
stv6110x_priv.h
stv6110x_reg.h
stv6110x.c
stv6110x.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tc90522.c [media] dvb: tc90522: re-add symbol-rate report 2015-02-03 17:16:52 -02:00
tc90522.h
tda665x.c
tda665x.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tda826x.c
tda826x.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tda1002x.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tda1004x.c
tda1004x.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tda8083.c
tda8083.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tda8261_cfg.h
tda8261.c
tda8261.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tda10021.c
tda10023.c
tda10048.c
tda10048.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tda10071_priv.h [media] si2168: tda10071: m88ds3103: Fix trivial typos 2015-04-08 14:57:15 -03:00
tda10071.c
tda10071.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tda10086.c
tda10086.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tda18271c2dd_maps.h
tda18271c2dd.c
tda18271c2dd.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tdhd1.h
ts2020.c [media] ts2020: do not use i2c_transfer() on sleep() 2015-04-02 22:27:32 -03:00
ts2020.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
tua6100.c
tua6100.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
ves1x93.c
ves1x93.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
ves1820.c
ves1820.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
z0194a.h
zl10036.c
zl10036.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
zl10039.c
zl10039.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00
zl10353_priv.h
zl10353.c
zl10353.h [media] Add and use IS_REACHABLE macro 2015-04-08 15:02:07 -03:00