David S. Miller 1f6d80358d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: arch/mips/net/bpf_jit.c drivers/net/can/flexcan.c Both the flexcan and MIPS bpf_jit conflicts were cases of simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-09-23 12:09:27 -04:00
..
boot	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2014-08-14 10:14:07 -06:00
configs	powerpc: Make CONFIG_FHANDLE=y for all 64 bit powerpc defconfigs	2014-09-09 19:02:46 +10:00
crypto	powerpc: Fix compile of sha1-powerpc-asm.S on 32-bit	2013-03-05 16:56:26 +11:00
include	powerpc: Wire up sys_seccomp(), sys_getrandom() and sys_memfd_create()	2014-09-09 19:02:47 +10:00
kernel	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2014-08-14 10:14:07 -06:00
kvm	powerpc/kvm/cma: Fix panic introduces by signed shift operation	2014-09-03 10:34:07 +02:00
lib	powerpc: Add smp_mb()s to arch_spin_unlock_wait()	2014-08-13 15:13:27 +10:00
math-emu	powerpc: Correct emulated mtfsf instruction	2014-04-07 10:33:11 +10:00
mm	powerpc/thp: Add tracepoints to track hugepage invalidate	2014-08-13 18:20:42 +10:00
net	net: bpf: be friendly to kmemcheck	2014-09-09 16:58:56 -07:00
oprofile	powerpc: Remove oprofile RS64 support	2014-07-28 14:10:25 +10:00
perf	powerpc/perf: Fix ABIv2 kernel backtraces	2014-09-09 19:02:45 +10:00
platforms	powerpc: use machine_subsys_initcall() for opal_hmi_handler_init()	2014-09-09 19:02:46 +10:00
sysdev	Merge remote-tracking branch 'scott/next' into next	2014-08-05 14:13:41 +10:00
xmon	powerpc: Hard disable interrupts in xmon	2014-08-13 15:13:48 +10:00
Kconfig	kexec: remove CONFIG_KEXEC dependency on crypto	2014-08-29 16:28:16 -07:00
Kconfig.debug	Patch queue for ppc - 2014-08-01	2014-08-05 09:58:11 +02:00
Makefile	Merge branch 'merge' into next	2014-05-28 13:30:12 +10:00
relocs_check.pl	Fix warning typo "CONFIG_RELCOATABLE"	2013-05-29 15:11:30 +02:00