Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts ...

Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2017-11-07 10:32:44 +01:00

..

demux.h

media: dvb-core/demux.h: fix kernel-doc warning

2017-07-21 08:01:08 -04:00

dmxdev.c

media: get rid of removed DMX_GET_CAPS and DMX_SET_SOURCE leftovers

2017-09-05 08:25:07 -04:00

dmxdev.h

[media] media: Drop FSF's postal address from the source code files

2017-01-27 11:38:09 -02:00

dvb_ca_en50221.c

media: dvb_ca_en50221: Fixed multiple blank lines

2017-07-20 15:40:50 -04:00

dvb_ca_en50221.h

media: dvb_ca_en50221.h: fix checkpatch strict warnings

2017-07-20 15:47:07 -04:00

dvb_demux.c

sched/headers: Prepare to move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>

2017-03-02 08:42:32 +01:00

dvb_demux.h

[media] media: Drop FSF's postal address from the source code files

2017-01-27 11:38:09 -02:00

dvb_frontend.c

media: dvb_frontend: only use kref after initialized

2017-10-11 12:47:36 -04:00

dvb_frontend.h

[media] docs-rst: media: better document refcount in struct dvb_frontend

2017-04-17 16:55:38 -03:00

dvb_math.c

[media] media: Drop FSF's postal address from the source code files

2017-01-27 11:38:09 -02:00

dvb_math.h

[media] media: Drop FSF's postal address from the source code files

2017-01-27 11:38:09 -02:00

dvb_net.c

networking: make skb_put & friends return void pointers

2017-06-16 11:48:39 -04:00

dvb_net.h

[media] media: Drop FSF's postal address from the source code files

2017-01-27 11:38:09 -02:00

dvb_ringbuffer.c

locking/atomics, media/dvb_ringbuffer: Convert ACCESS_ONCE() to READ_ONCE()/WRITE_ONCE()

2017-10-25 11:00:58 +02:00

dvb_ringbuffer.h

scripts/spelling.txt: add "an user" pattern and fix typo instances

2017-02-27 18:43:46 -08:00

dvb-usb-ids.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

dvbdev.c

[media] media: Drop FSF's postal address from the source code files

2017-01-27 11:38:09 -02:00

dvbdev.h

[media] media: Drop FSF's postal address from the source code files

2017-01-27 11:38:09 -02:00

Kconfig

[media] Raise adapter number limit

2016-11-23 13:28:43 -02:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00