David S. Miller 0b42f25d2f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... udplite conflict is resolved by taking what 'net-next' did which removed the backlog receive method assignment, since it is no longer necessary. Two entries were added to the non-priv ethtool operations switch statement, one in 'net' and one in 'net-next, so simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2016-11-26 23:42:21 -05:00
..
boot	powerpc/boot: Fix the early OPAL console wrappers	2016-11-24 17:34:01 +11:00
configs	arch/powerpc: Enable dpaa_eth	2016-11-15 22:34:25 -05:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2016-10-10 14:04:16 -07:00
include	powerpc fixes for 4.9 #6	2016-11-26 11:24:03 -08:00
kernel	powerpc fixes for 4.9 #6	2016-11-26 11:24:03 -08:00
kvm	KVM: PPC: Book3S HV: Fix build error when SMP=n	2016-10-22 08:44:37 +11:00
lib	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-10-14 14:26:58 -07:00
math-emu
mm	powerpc/mm: Fixup kernel read only mapping	2016-11-25 14:18:25 +11:00
net	powerpc/bpf: Add support for bpf constant blinding	2016-10-04 20:33:20 +11:00
oprofile	powerpc/sparse: Make a bunch of things static	2016-09-13 17:35:47 +10:00
perf	powerpc/sparse: Make a bunch of things static	2016-09-13 17:35:47 +10:00
platforms	powerpc updates for 4.9 #2	2016-10-14 11:07:42 -07:00
scripts	powerpc/ftrace: Add Kconfig & Make glue for mprofile-kernel	2016-03-07 14:53:56 +11:00
sysdev	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2016-10-14 14:26:58 -07:00
xmon	powerpc/xmon: Don't use ld on 32-bit	2016-09-13 17:37:02 +10:00
Kconfig	Merge branch 'akpm' (patches from Andrew)	2016-10-07 21:38:00 -07:00
Kconfig.debug	powerpc/mm: Catch usage of cpu/mmu_has_feature() before jump label init	2016-08-01 11:15:06 +10:00
Makefile	arch/powerpc: Add CONFIG_FSL_DPAA to corenetXX_smp_defconfig	2016-09-25 02:39:01 -05:00
relocs_check.sh	powerpc/64: whitelist unresolved modversions CRCs	2016-09-22 14:46:31 +02:00