Daniel Vetter 0d9d349d87 Merge commit origin/master into drm-intel-next ... Conflicts are getting out of hand, and now we have to shuffle even more in -next which was also shuffled in -fixes (the call for drm_mode_config_reset needs to move yet again). So do a proper backmerge. I wanted to wait with this for the 3.13 relaese, but alas let's just do this now. Conflicts: drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_ddi.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_pm.c Besides the conflict around the forcewake get/put (where we chaged the called function in -fixes and added a new parameter in -next) code all the current conflicts are of the adjacent lines changed type. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2014-01-16 22:06:30 +01:00
..
agp	drm/i915: Kill legeacy AGP for gen3 kms	2013-11-14 01:42:29 +01:00
hw_random	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2013-11-23 16:18:25 -08:00
ipmi	BMC support for PARISC machines	2013-09-05 08:34:32 -07:00
mwave	mwave: fix info leak in mwave_ioctl()	2013-07-09 10:33:28 -07:00
pcmcia	pcmcia: synclink_cs: replace sum of bitmasks with OR operation.	2013-07-26 17:59:07 -07:00
tpm	ACPI / TPM: fix memory leak when walking ACPI namespace	2014-01-05 15:54:21 +01:00
xilinx_hwicap	char: hwicap: Remove unnecessary dev_set_drvdata()	2013-10-03 16:03:31 -07:00
Kconfig	drivers/char/hpet.c: allow user controlled mmap for user processes	2013-11-13 12:09:11 +09:00
Makefile	drm/i915: Make AGP support optional	2013-11-08 18:37:32 +01:00
apm-emulation.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm	2012-04-05 17:34:30 -07:00
applicom.c	applicom: use correct array offset	2013-03-15 12:23:48 -07:00
applicom.h	…
bfin-otp.c	…
bsr.c	drivers: clean-up prom.h implicit includes	2013-10-09 20:04:04 -05: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	new helper: file_inode(file)	2013-02-22 23:31:31 -05: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	drivers: fix up various ->llseek() implementations	2011-07-20 20:47:58 -04:00
genrtc.c	rtc: single_open() leaks	2013-05-05 00:12:29 -04:00
hangcheck-timer.c	…
hpet.c	drivers/char/hpet.c: allow user controlled mmap for user processes	2013-11-13 12:09:11 +09:00
i8k.c	drivers/char/i8k.c: add Dell XPLS L421X	2013-12-04 20:22:40 -08:00
lp.c	Char: lp, protect LPGETSTATUS with port_mutex	2013-05-16 18:08:58 -07:00
mbcs.c	char: remove use of __devinitconst	2012-11-21 12:55:19 -08:00
mbcs.h	Fix common misspellings	2011-03-31 11:26:23 -03:00
mem.c	/dev/oldmem: Remove the interface	2013-07-03 16:08:03 -07:00
misc.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-11-13 15:34:18 +09:00
mmtimer.c	drivers/char/mmtimer.c: Remove useless kfree	2012-09-26 13:20:40 -07:00
msm_smd_pkt.c	drivers/char/msm_smd_pkt.c: don't use IS_ERR()	2011-08-25 16:25:33 -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	various char drivers: remove deprecated IRQF_DISABLED	2013-10-16 12:36:10 -07: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	The /dev/random changes for 3.13 including a number of improvements in	2013-11-16 10:19:15 -08:00
raw.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
rtc.c	various char drivers: remove deprecated IRQF_DISABLED	2013-10-16 12:36:10 -07:00
scx200_gpio.c	…
snsc.c	various char drivers: remove deprecated IRQF_DISABLED	2013-10-16 12:36:10 -07:00
snsc.h	headers: kobject.h redux	2011-01-10 08:51:44 -08:00
snsc_event.c	various char drivers: remove deprecated IRQF_DISABLED	2013-10-16 12:36:10 -07:00
sonypi.c	ACPI: Remove the old /proc/acpi/event interface	2013-07-15 13:56:36 +02:00
tb0219.c	new helper: file_inode(file)	2013-02-22 23:31:31 -05:00
tile-srom.c	PTR_RET() is a weird name, and led to some confusing usage. We ended	2013-09-04 17:31:11 -07:00
tlclk.c	tlclk: remove deprecated IRQF_DISABLED	2013-10-16 12:36:10 -07:00
toshiba.c	…
ttyprintk.c	ttyprintk: Fix NULL pointer deref by setting tty_port ops after initializing port	2013-05-21 10:13:23 -07:00
uv_mmtimer.c	BKL: remove extraneous #include <smp_lock.h>	2010-11-17 08:59:32 -08:00
virtio_console.c	virtio_console: verify if queue is broken after virtqueue_get_buf()	2013-10-29 11:28:18 +10:30