David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx4/cmd.c net/core/fib_rules.c net/ipv4/fib_frontend.c The fib_rules.c and fib_frontend.c conflicts were locking adjustments in 'net' overlapping addition and removal of code in 'net-next'. The mlx4 conflict was a bug fix in 'net' happening in the same place a constant was being replaced with a more suitable macro. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-06 22:34:15 -04:00
..
alpha	asm-generic: uaccess.h cleanup	2015-02-18 10:02:24 -08:00
arc	ARC: signal handling robustify	2015-03-26 11:19:36 +05:30
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
arm64	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
avr32	asm-generic: uaccess.h cleanup	2015-02-18 10:02:24 -08:00
blackfin	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2015-02-21 12:59:04 -08:00
c6x	arch/c6x/include/asm/pgtable.h: define dummy pgprot_writecombine for !MMU	2015-03-12 18:46:08 -07:00
cris
frv	mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines	2015-02-28 09:57:51 -08:00
hexagon
ia64	asm-generic: uaccess.h cleanup	2015-02-18 10:02:24 -08:00
m32r	mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines	2015-02-28 09:57:51 -08:00
m68k	mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines	2015-02-28 09:57:51 -08:00
metag	metag: Fix ioremap_wc/ioremap_cached build errors	2015-03-23 12:32:37 +00:00
microblaze	microblaze: Fix syscall error recovery for invalid syscall IDs	2015-03-04 15:12:27 +01:00
mips	KVM: MIPS: Enable after disabling interrupt	2015-03-02 19:18:12 -03:00
mn10300	mm: add missing __PAGETABLE_{PUD,PMD}_FOLDED defines	2015-02-28 09:57:51 -08:00
nios2	nios2: mm: do not invoke OOM killer on kernel fault OOM	2015-03-16 15:35:25 +08:00
openrisc	asm-generic: uaccess.h cleanup	2015-02-18 10:02:24 -08:00
parisc	parisc: Fix pmd code to depend on PT_NLEVELS value, not on CONFIG_64BIT	2015-03-23 12:28:16 +01:00
powerpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-06 22:34:15 -04:00
s390	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-02 16:16:53 -04:00
score
sh	asm-generic: uaccess.h cleanup	2015-02-18 10:02:24 -08:00
sparc	sparc64: Fix several bugs in memmove().	2015-03-23 09:22:10 -07:00
tile	ptp: tilegx: convert to the 64 bit get/set time methods.	2015-03-31 12:01:18 -04:00
um
unicore32
x86	Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2015-04-03 10:42:32 -07:00
xtensa	asm-generic: uaccess.h cleanup	2015-02-18 10:02:24 -08:00
.gitignore
Kconfig