David S. Miller e2a553dbf1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/net/ipip.h The changes made to ipip.h in 'net' were already included in 'net-next' before that header was moved to another location. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-03-27 13:52:49 -04:00
..
boot	Merge remote-tracking branch 'agust/next' into next	2013-02-20 11:39:05 +11:00
configs	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-02-23 17:09:55 -08:00
crypto	powerpc: Fix compile of sha1-powerpc-asm.S on 32-bit	2013-03-05 16:56:26 +11:00
include	powerpc: Rename USER_ESID_BITS* to ESID_BITS*	2013-03-17 12:45:44 +11:00
kernel	powerpc: Rename USER_ESID_BITS* to ESID_BITS*	2013-03-17 12:45:44 +11:00
kvm	powerpc: Rename USER_ESID_BITS* to ESID_BITS*	2013-03-17 12:45:44 +11:00
lib	uprobes/powerpc: Add dependency on single step emulation	2013-01-29 11:35:06 +11:00
math-emu	powerpc/math_emu/efp: Look for errata handler when type mismatches	2011-10-06 23:36:47 -05:00
mm	powerpc: Rename USER_ESID_BITS* to ESID_BITS*	2013-03-17 12:45:44 +11:00
net	filter: bpf_jit_comp: refactor and unify BPF JIT image dump output	2013-03-21 17:25:56 -04:00
oprofile	Merge branch 'merge' into next	2013-01-29 11:33:37 +11:00
perf	perf/urgent fixes:	2013-03-18 10:00:56 +01:00
platforms	mv643xx_eth: convert to use the Marvell Orion MDIO driver	2013-03-22 10:25:15 -04:00
sysdev	mv643xx_eth: convert to use the Marvell Orion MDIO driver	2013-03-22 10:25:15 -04:00
xmon	powerpc: Rename set_break to avoid naming conflict	2013-01-16 05:25:47 +11:00
Kconfig	Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-03-18 08:12:41 -07:00
Kconfig.debug	powerpc: IOMMU fault injection	2012-07-10 19:18:59 +10:00
Makefile	powerpc: Avoid load of static chain register when calling nested functions through a pointer on 64bit	2013-01-10 17:01:27 +11:00
relocs_check.pl	powerpc: Process dynamic relocations for kernel	2011-12-20 10:21:08 -05:00