David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/bcm7xxx.c drivers/net/phy/marvell.c drivers/net/vxlan.c All three conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-02-23 00:09:14 -05:00
..
alpha	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00
arc	ARC fixes for 4.5	2016-02-13 08:18:21 -08:00
arm	arm64 fixes:	2016-02-19 08:40:05 -08:00
arm64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05: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	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -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] Enable copy_file_range syscall for ia64	2016-01-22 14:20:01 -08:00
m32r	m32r: fix build failure due to SMP and MMU	2016-02-05 18:10:40 -08:00
m68k	m68k/defconfig: Update defconfigs for v4.5-rc1	2016-02-01 10:35:38 +01: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 branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2016-02-14 10:49:01 -08:00
mn10300	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -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 #2	2016-02-20 09:22:11 -08:00
s390	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux	2016-02-19 08:33:12 -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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2016-02-23 00:09:14 -05:00
xtensa	dma-mapping: remove <asm-generic/dma-coherent.h>	2016-01-20 17:09:18 -08:00
.gitignore
Kconfig	dma-mapping: always provide the dma_map_ops based implementation	2016-01-20 17:09:18 -08:00