Greg Kroah-Hartman 69c1f05379 Merge 3.15-rc6 into staging-next. ...

This resolves the conflicts in the files:
	drivers/iio/adc/Kconfig
	drivers/staging/rtl8723au/os_dep/usb_ops_linux.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2014-05-22 23:27:17 +09: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

Staging driver fixes for 3.15-rc6

2014-05-21 19:00:09 +09:00

arm64

- arm64 migrate_irqs() fix following commit ffde1de64012 (irqchip: Gic:

2014-05-20 14:33:48 +09: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

Drivercore bugfixes for v3.15

2014-05-21 17:54:55 +09: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: add renameat2 syscall

2014-05-20 10:59:37 +02:00

powerpc

powerpc: irq work racing with timer interrupt can result in timer interrupt hang

2014-05-12 14:29:28 +10:00

s390

Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2014-05-21 18:34:35 +09: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: Give more detailed information in {pgd,pmd}_ERROR() and kill pte_ERROR().

2014-05-03 22:56:25 -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 3.15-rc6 into staging-next.

2014-05-22 23:27:17 +09: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