David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
boot	powerpc: dts: pq3/85xx: Fix GPIO address	2015-01-29 23:04:32 -06:00
configs	The clock framework changes for 3.20 contain the usual driver additions,	2015-02-21 12:30:30 -08:00
crypto	crypto: add missing crypto module aliases	2015-01-13 22:29:11 +11:00
include	ppc: bpf: add reqired opcodes for ppc32	2015-02-20 15:19:43 -05:00
kernel	The clock framework changes for 3.20 contain the usual driver additions,	2015-02-21 12:30:30 -08:00
kvm	Tighten rules for ACCESS_ONCE	2015-02-14 10:54:28 -08:00
lib	powerpc/lib: Makefile, use obj64-y to consolidate 64-bit rules	2015-01-28 15:00:24 +11:00
math-emu	powerpc: Correct emulated mtfsf instruction	2014-04-07 10:33:11 +10:00
mm	powerpc: drop _PAGE_FILE and pte_file()-related helpers	2015-02-16 17:56:05 -08:00
net	ppc: bpf: Add SKF_AD_CPU for ppc32	2015-02-20 15:19:43 -05:00
oprofile	powerpc updates for 3.19	2014-12-11 17:48:14 -08:00
perf	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next	2015-02-04 12:03:21 +11:00
platforms	The clock framework changes for 3.20 contain the usual driver additions,	2015-02-21 12:30:30 -08:00
sysdev	powerpc: use %*pb[l] to print bitmaps including cpumasks and nodemasks	2015-02-13 21:21:36 -08:00
xmon	powerpc updates for 3.20	2015-02-11 18:15:38 -08:00
Kconfig	ppc: Kconfig: Enable BPF JIT on ppc32	2015-02-20 15:19:43 -05:00
Kconfig.debug	Patch queue for ppc - 2014-08-01	2014-08-05 09:58:11 +02:00
Makefile	kbuild: do not add $(call ...) to invoke cc-version or cc-fullversion	2015-01-09 17:25:44 +01:00
relocs_check.pl	Fix warning typo "CONFIG_RELCOATABLE"	2013-05-29 15:11:30 +02:00