linux/arch/powerpc
David S. Miller c99f7abf0e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	include/net/inetpeer.h
	net/ipv6/output_core.c

Changes in net were fixing bugs in code removed in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-06-03 23:32:12 -07:00
..
boot powerpc: Bump BOOT_COMMAND_LINE_SIZE to 2048 2014-04-28 16:32:02 +10:00
configs Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2014-04-12 14:49:50 -07:00
crypto
include Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 2014-06-01 18:30:07 -07:00
kernel Small fixes for x86, slightly larger fixes for PPC, and a forgotten s390 patch. 2014-05-28 08:08:03 -07:00
kvm Patch queue for 3.15 - 2014-05-12 2014-05-13 18:15:16 +02:00
lib
math-emu powerpc: Correct emulated mtfsf instruction 2014-04-07 10:33:11 +10:00
mm Patch queue for 3.15 - 2014-05-12 2014-05-13 18:15:16 +02:00
net net: filter: get rid of BPF_S_* enum 2014-06-01 22:16:58 -07:00
oprofile
perf powerpc/perf/hv-24x7: Catalog version number is be64, not be32 2014-04-28 16:31:50 +10:00
platforms powerpc/powernv: Reset root port in firmware 2014-05-12 10:33:08 +10:00
sysdev powerpc/fsl: fsl_soc: remove 'fixed-link' parsing code 2014-05-22 15:16:44 -04:00
xmon
Kconfig Merge git://git.infradead.org/users/eparis/audit 2014-04-12 12:38:53 -07:00
Kconfig.debug
Makefile powerpc: Fix 64 bit builds with binutils 2.24 2014-05-28 13:24:05 +10:00
relocs_check.pl