Daniel Vetter 622147fdad Merge tag 'drm-intel-fixes-2015-08-14' into drm-intel-next-fixes ...

Backmerge drm-intel-fixes because a bunch of atomic patch backporting
we had to do lead to horrible conflicts.

Conflicts:
	drivers/gpu/drm/drm_crtc.c
Just a bit of context conflict between -next and -fixes.
	drivers/gpu/drm/i915/intel_atomic.c
	drivers/gpu/drm/i915/intel_display.c
Atomic conflicts, always pick the code from -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

2015-08-14 18:11:30 +02:00

..

agp

Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued

2015-07-15 16:36:50 +02:00

hw_random

hwrng: core - correct error check of kthread_run call

2015-07-28 14:59:54 +08:00

ipmi

Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux

2015-07-01 10:49:25 -07:00

mwave

drivers/char: delete non-required instances of include <linux/init.h>

2014-02-07 15:10:19 -08:00

pcmcia

Merge tag 'char-misc-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

2015-06-26 14:51:15 -07:00

tpm

tpm, tpm_crb: fail when TPM2 ACPI table contents look corrupted

2015-07-13 23:34:12 +02:00

xilinx_hwicap

char:xilinx_hwicap:buffer_icap - change 1/0 to true/false for bool type variable in function buffer_icap_set_configuration().

2015-06-12 16:58:33 -07:00

xillybus

xillybus: XILLYBUS_OF should depend on HAS_DMA

2015-05-24 12:24:35 -07:00

apm-emulation.c

apm-emulation: add hibernation APM events to support suspend2disk

2014-01-07 13:50:28 +01:00

applicom.c

applicom: dereferencing NULL on error path

2014-05-27 17:43:12 -07:00

applicom.h

…

bfin-otp.c

…

bsr.c

bsr: avoid format string leaking into device name

2014-07-09 16:59:15 -07:00

ds1302.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ds1620.c

ds1620: single_open() leak

2013-05-05 00:11:29 -04:00

dsp56k.c

drivers/char/dsp56k.c: drop check for negativity of unsigned parameter

2014-07-17 18:38:37 -07:00

dtlk.c

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

efirtc.c

rtc: single_open() leaks

2013-05-05 00:12:29 -04:00

generic_nvram.c

…

genrtc.c

rtc: single_open() leaks

2013-05-05 00:12:29 -04:00

hangcheck-timer.c

hangcheck-timer: cleanup casting in hangcheck_init()

2014-11-07 11:24:01 -08:00

hpet.c

ACPICA: Resources: Provide common part for struct acpi_resource_address structures.

2015-01-26 16:09:56 +01:00

Kconfig

drivers/char: Remove msm_smd_pkt driver

2015-05-24 12:24:35 -07:00

lp.c

char: Int overflow in lp_do_ioctl().

2013-12-18 16:39:54 -08:00

Makefile

hwmon: Rename i8k driver to dell-smm-hwmon and move it to hwmon tree

2015-05-24 12:48:12 -07:00

mbcs.c

char: remove use of __devinitconst

2012-11-21 12:55:19 -08:00

mbcs.h

…

mem.c

switch drivers/char/mem.c to ->read_iter/->write_iter

2015-04-11 22:29:40 -04:00

misc.c

char: misc: restore MISC_DYNAMIC_MINOR on device_create() failure

2015-06-01 06:38:21 +09:00

mmtimer.c

drivers/char/mmtimer.c: Remove useless kfree

2012-09-26 13:20:40 -07:00

mspec.c

char: Use vma_pages() to replace (vm_end - vm_start) >> PAGE_SHIFT

2013-05-21 10:07:54 -07:00

nsc_gpio.c

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

nvram.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

nwbutton.c

char: nwbutton: open-code interruptible_sleep_on

2014-01-08 15:29:52 -08:00

nwbutton.h

…

nwflash.c

Merge branch 'late/fixes' into fixes

2012-10-07 07:22:32 -07:00

pc8736x_gpio.c

pc8736x_gpio: use platform_device_unregister in pc8736x_gpio_cleanup()

2012-10-24 15:52:29 -07:00

ppdev.c

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

ps3flash.c

ps3flash: switch to generic_file_llseek_size()

2013-06-29 12:57:33 +04:00

random.c

random: Remove kernel blocking API

2015-06-10 19:14:04 +08:00

raw.c

writeback: separate out include/linux/backing-dev-defs.h

2015-06-02 08:33:34 -06:00

rtc.c

various char drivers: remove deprecated IRQF_DISABLED

2013-10-16 12:36:10 -07:00

scx200_gpio.c

…

snsc_event.c

various char drivers: remove deprecated IRQF_DISABLED

2013-10-16 12:36:10 -07:00

snsc.c

snsc: pass timeout as HZ independent value

2015-06-01 10:29:50 +09:00

snsc.h

…

sonypi.c

char: drop owner assignment from platform_drivers

2014-10-20 16:20:19 +02:00

tb0219.c

char: drop owner assignment from platform_drivers

2014-10-20 16:20:19 +02:00

tile-srom.c

fs: move struct kiocb to fs.h

2015-03-25 20:28:11 -04:00

tlclk.c

tlclk: remove deprecated IRQF_DISABLED

2013-10-16 12:36:10 -07:00

toshiba.c

…

ttyprintk.c

ttyprintk: Allow built as a module

2014-04-16 14:21:06 -07:00

uv_mmtimer.c

…

virtio_console.c

virtio_console: silence a static checker warning

2015-05-24 12:24:35 -07:00