David S. Miller 1459143386 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ieee802154/fakehard.c A bug fix went into 'net' for ieee802154/fakehard.c, which is removed in 'net-next'. Add build fix into the merge from Stephen Rothwell in openvswitch, the logging macros take a new initial 'log' argument, a new call was added in 'net' so when we merge that in here we have to explicitly add the new 'log' arg to it else the build fails. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-11-21 22:28:24 -05:00
..
boot	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux	2014-10-11 20:34:00 -04:00
configs	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux	2014-10-21 07:48:56 -07:00
crypto	…
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-14 01:01:12 -05:00
kernel	powerpc: do_notify_resume can be called with bad thread_info flags argument	2014-10-31 16:52:46 +11:00
kvm	Fixes and features for 3.18.	2014-10-08 05:27:39 -04:00
lib	powerpc: Implement emulation of string loads and stores	2014-09-25 23:14:52 +10:00
math-emu	…
mm	powerpc: Fix section mismatch warning	2014-10-30 11:22:33 +11:00
net	PPC: bpf_jit_comp: Unify BPF_MOD | BPF_X and BPF_DIV | BPF_X	2014-11-18 13:20:09 -05:00
oprofile	powerpc: Ensure global functions include their prototype	2014-09-25 23:14:42 +10:00
perf	perf: Fix and clean up initialization of pmu::event_idx	2014-10-28 10:51:01 +01:00
platforms	powerpc: use device_online/offline() instead of cpu_up/down()	2014-11-02 10:55:56 +11:00
sysdev	powerpc/fsl_msi: mark the msi cascade handler IRQF_NO_THREAD	2014-11-17 22:00:30 -06:00
xmon	powerpc: Hard disable interrupts in xmon	2014-08-13 15:13:48 +10:00
Kconfig	powerpc/cell: Move spu_handle_mm_fault() out of cell platform	2014-10-08 20:14:54 +11:00
Kconfig.debug	Patch queue for ppc - 2014-08-01	2014-08-05 09:58:11 +02:00
Makefile	powerpc: Add POWER8 CPU selection	2014-09-25 23:14:49 +10:00
relocs_check.pl	…