Greg Kroah-Hartman 249f3c4fe4 Merge 4.5-rc4 into tty-next ... We want the fixes in here, and this resolves a merge error in tty_io.c Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2016-02-14 14:36:04 -08:00
..
alpha	serial: Fix ASYNC_* => UPF_* flags misuse	2016-01-28 14:17:42 -08:00
arc	ARC fixes for 4.5	2016-02-13 08:18:21 -08:00
arm	Merge 4.5-rc4 into tty-next	2016-02-14 14:36:04 -08:00
arm64	Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-02-14 11:49:30 -08:00
avr32	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
blackfin	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
c6x	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
cris	Merge branch 'akpm' (patches from Andrew)	2016-01-21 12:32:08 -08:00
frv	serial: Fix ASYNC_* => UPF_* flags misuse	2016-01-28 14:17:42 -08:00
h8300	Merge branch 'akpm' (patches from Andrew)	2016-01-21 12:32:08 -08:00
hexagon	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
ia64	ia64: Pin controlling tty for unaligned fault message	2016-01-28 14:13:44 -08:00
m32r	m32r: fix build failure due to SMP and MMU	2016-02-05 18:10:40 -08:00
m68k	serial: Fix ASYNC_* => UPF_* flags misuse	2016-01-28 14:17:42 -08:00
metag	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
microblaze	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
mips	Merge 4.5-rc4 into tty-next	2016-02-14 14:36:04 -08:00
mn10300	serial: Fix ASYNC_* => UPF_* flags misuse	2016-01-28 14:17:42 -08:00
nios2	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
openrisc	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
parisc	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
powerpc	powerpc fixes for 4.5	2016-01-29 16:10:16 -08:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2016-01-29 16:05:18 -08:00
score
sh	sh: fix smp_store_mb for !SMP	2016-01-26 10:18:29 +02:00
sparc	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
tile	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
um	um: asm/page.h: remove the pte_high member from struct pte_t	2016-02-05 18:10:40 -08:00
unicore32	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
x86	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2016-02-14 10:50:26 -08:00
xtensa	TTY: xtensa/iss/console, remove unused _INLINE_ definition	2016-02-06 22:16:21 -08:00
.gitignore
Kconfig	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00