Dave Airlie 8d4ad9d4bb Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next ... Merge drm-fixes into drm-next. Both i915 and radeon need this done for later patches. Conflicts: drivers/gpu/drm/drm_crtc_helper.c drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/i915_gem_execbuffer.c drivers/gpu/drm/i915/i915_gem_gtt.c		2014-06-05 20:28:59 +10:00
..
alpha	Merge git://git.infradead.org/users/eparis/audit	2014-04-12 12:38:53 -07:00
arc	ARC: !PREEMPT: Ensure Return to kernel mode is IRQ safe	2014-04-30 08:21:43 -07:00
arm	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2014-05-29 18:31:09 -07:00
arm64	arm64: mm: fix pmd_write CoW brokenness	2014-05-29 11:31:14 +01:00
avr32	Char/Misc driver patches for 3.15-rc1	2014-04-01 16:13:21 -07:00
blackfin	blackfin updates for Linux 3.15	2014-04-12 17:26:45 -07:00
c6x	Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-03-31 10:59:39 -07:00
cris	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
frv	PCI changes for the v3.15 merge window:	2014-04-01 15:14:04 -07:00
hexagon	Hexagon: Delete stale barrier.h	2014-05-01 10:09:47 -07:00
ia64	ia64: add renameat2 syscall	2014-05-20 10:59:38 +02:00
m32r	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
m68k	m68k: add renameat2 syscall	2014-05-20 10:59:37 +02:00
metag	metag: Remove _STK_LIM_MAX override	2014-05-15 00:30:32 +01:00
microblaze	Microblaze patches for 3.15-rc1	2014-04-11 11:53:45 -07:00
mips	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2014-06-01 18:28:58 -07:00
mn10300	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2014-04-12 14:49:50 -07:00
openrisc	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
parisc	parisc: 'renameat2()' doesn't need (or have) a separate compat system call	2014-05-23 09:23:51 -07:00
powerpc	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2014-06-01 18:30:07 -07:00
s390	Small fixes for x86, slightly larger fixes for PPC, and a forgotten s390 patch.	2014-05-28 08:08:03 -07:00
score	score: remove unused CPU_SCORE7 Kconfig parameter	2014-04-03 16:20:52 -07:00
sh	mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts	2014-04-25 16:05:40 -07:00
sparc	sparc64: fix format string mismatch in arch/sparc/kernel/sysfs.c	2014-05-21 12:54:42 -07:00
tile	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
um	mm: split 'tlb_flush_mmu()' into tlb flushing and memory freeing parts	2014-04-25 16:05:40 -07:00
unicore32	Kconfig: rename HAS_IOPORT to HAS_IOPORT_MAP	2014-04-07 16:36:11 -07:00
x86	Merge commit '9e9a928eed8796a0a1aaed7e0b676db86ba84594' into drm-next	2014-06-05 20:28:59 +10:00
xtensa	Xtensa patchset for v3.15.	2014-05-05 15:36:59 -07:00
.gitignore
Kconfig	uprobes: Kconfig dependency fix	2014-03-18 16:39:33 -04:00