David S. Miller 53af53ae83 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: include/linux/netdevice.h net/core/sock.c Trivial merge issues. Removal of "extern" for functions declaration in netdevice.h at the same time "const" was added to an argument. Two parallel line additions in net/core/sock.c Signed-off-by: David S. Miller <davem@davemloft.net>		2013-10-08 23:07:53 -04:00
..
boot	powerpc/zImage: make the "OF" wrapper support ePAPR boot	2013-09-25 14:18:44 +10:00
configs	powerpc/85xx: Add C293PCIE board support	2013-08-23 19:43:24 -05:00
crypto	powerpc: Fix compile of sha1-powerpc-asm.S on 32-bit	2013-03-05 16:56:26 +11:00
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-10-01 17:06:14 -04:00
kernel	powerpc/pseries: Do not start secondaries in Open Firmware	2013-09-25 14:19:00 +10:00
kvm	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-09-06 10:49:42 -07:00
lib	powerpc: Remove ksp_limit on ppc64	2013-09-25 14:15:51 +10:00
math-emu	powerpc/math-emu: Fix load/store indexed emulation	2013-08-14 14:59:57 +10:00
mm	arch: mm: pass userspace fault flag to generic fault handler	2013-09-12 15:38:01 -07:00
net	net: fix unsafe set_memory_rw from softirq	2013-10-07 15:16:45 -04:00
oprofile	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-09-06 10:49:42 -07:00
perf	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc	2013-09-06 10:49:42 -07:00
platforms	powerpc/pseries: Do not start secondaries in Open Firmware	2013-09-25 14:19:00 +10:00
sysdev	IOMMU Updates for Linux v3.12	2013-09-12 11:29:26 -07:00
xmon	powerpc/xmon: Fix printing of set of CPUs in xmon	2013-09-05 17:29:19 +10:00
Kconfig	Remove GENERIC_HARDIRQ config option	2013-09-13 15:09:52 +02:00
Kconfig.debug	Merge branch 'kconfig-diet' from Dave Hansen	2013-07-04 11:25:51 -07:00
Makefile	powerpc/e500: Set -mcpu flag for 32-bit e500	2013-08-20 20:49:56 -05:00
relocs_check.pl	Fix warning typo "CONFIG_RELCOATABLE"	2013-05-29 15:11:30 +02:00