Dave Airlie e8115e79aa Merge tag 'v3.18-rc7' into drm-next ...

This fixes a bunch of conflicts prior to merging i915 tree.

Linux 3.18-rc7

Conflicts:
	drivers/gpu/drm/exynos/exynos_drm_drv.c
	drivers/gpu/drm/i915/i915_drv.c
	drivers/gpu/drm/i915/intel_pm.c
	drivers/gpu/drm/tegra/dc.c

2014-12-02 10:58:33 +10:00

..

alpha

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

arc

Merge tag 'remove-weak-declarations' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

2014-10-23 15:04:27 -07:00

arm

Merge tag 'v3.18-rc7' into drm-next

2014-12-02 10:58:33 +10:00

arm64

arm64: KVM: Handle traps of ICC_SRE_EL1 as RAZ/WI

2014-11-26 14:40:43 +01:00

avr32

Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma

2014-10-18 18:11:04 -07:00

blackfin

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

c6x

irq_work: Introduce arch_irq_work_has_interrupt()

2014-09-13 18:38:07 +02:00

cris

Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-13 16:23:15 +02:00

frv

frv: remove unused declarations of __start___ex_table and __stop___ex_table

2014-10-14 02:18:28 +02:00

hexagon

Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-13 15:48:00 +02:00

ia64

kvm: fix kvm_is_mmio_pfn() and rename to kvm_is_reserved_pfn()

2014-11-26 14:40:45 +01:00

m32r

Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-13 15:48:00 +02:00

m68k

m68k: Wire up bpf

2014-10-27 11:02:19 +01:00

metag

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

microblaze

microblaze: Wire up bpf syscall

2014-10-27 09:25:34 +01:00

mips

MIPS: tlbex: Fix potential HTW race on TLBL/M/S handlers

2014-11-27 17:21:56 +01:00

mn10300

Merge branch 'locking-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2014-10-13 15:48:00 +02:00

openrisc

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

parisc

parisc: Avoid using CONFIG_64BIT in userspace exported headers

2014-11-10 22:25:29 +01:00

powerpc

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

2014-11-27 18:23:41 -08:00

s390

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2014-11-05 12:13:52 -08:00

score

score: use Kbuild logic to include <asm-generic/sections.h>

2014-10-09 22:25:46 -04:00

sh

sh: fix sh770x SCIF memory regions

2014-10-29 16:33:15 -07:00

sparc

sparc: Add NOP dma_cache_sync() implementation.

2014-11-26 13:36:41 -08:00

tile

Merge branch 'for-3.18-consistent-ops' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2014-10-15 07:48:18 +02:00

um

Merge git://git.infradead.org/users/eparis/audit

2014-10-19 16:25:56 -07:00

unicore32

nosave: consolidate __nosave_{begin,end} in <asm/sections.h>

2014-10-09 22:26:04 -04:00

x86

Merge tag 'v3.18-rc7' into drm-next

2014-12-02 10:58:33 +10:00

xtensa

Merge tag 'xtensa-for-next-20141021-1' of git://github.com/jcmvbkbc/linux-xtensa into for_next

2014-10-23 10:30:33 -07:00

.gitignore

…

Kconfig

seccomp: Document two-phase seccomp and arch-provided seccomp_data

2014-09-03 14:58:17 -07:00