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
..
alchemy	MIPS: Alchemy: DB1300: Add touch penirq support	2014-09-22 13:35:47 +02:00
ar7
ath79	MIPS: ath79: Fix compilation error when CONFIG_PCI is disabled	2014-10-22 23:16:59 +02:00
bcm47xx	Merge tag 'master-2014-09-16' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2014-09-26 15:39:24 -04:00
bcm63xx	MIPS: BCM63xx: delete double assignment	2014-08-26 02:18:58 +02:00
boot	MIPS: ralink: Move device-trees to arch/mips/boot/dts/	2014-09-22 13:35:50 +02:00
cavium-octeon	MIPS: Octeon: Make Octeon GPIO IRQ chip CPU hotplug-aware	2014-10-27 01:43:57 +01:00
cobalt
configs	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2014-10-18 14:24:36 -07:00
dec
emma
fw
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-11-21 22:28:24 -05:00
jazz
jz4740	This is the bulk of GPIO changes for the v3.17 development	2014-08-08 18:00:35 -07:00
kernel	MIPS: jump_label.c: Handle the microMIPS J instruction encoding	2014-11-19 18:22:09 +01:00
kvm	KVM: remove garbage arg to *hardware_{en,dis}able	2014-08-29 16:35:55 +02:00
lantiq	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2014-10-18 14:24:36 -07:00
lasat	MIPS: Lasat: Add missing CONFIG_PROC_FS dependency to PICVUE_PROC	2014-10-21 17:35:44 +02:00
lib	MIPS: lib: memcpy: Restore NOP on delay slot before returning to caller	2014-11-19 18:22:08 +01:00
loongson	MIPS: Loongson3: Fix __node_distances undefined error	2014-11-19 18:22:07 +01:00
loongson1
math-emu	MIPS: Fix build with binutils 2.24.51+	2014-11-07 15:07:36 +01:00
mm	MIPS: tlb-r4k: Add missing HTW stop/start sequences	2014-11-19 18:22:08 +01:00
mti-malta	MIPS: Malta: Do not build the malta-amon.c file if CMP is not enabled	2014-10-23 20:05:55 +02:00
mti-sead3	MIPS: SEAD3: Fix I2C device registration.	2014-10-24 13:34:42 +02:00
net	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2014-10-18 14:24:36 -07:00
netlogic	MIPS: Netlogic: Move device-trees to arch/mips/boot/dts/	2014-09-22 13:35:50 +02:00
oprofile	MIPS: oprofile: Fix backtrace on 64-bit kernel	2014-11-19 18:22:07 +01:00
paravirt
pci	MIPS/Xlp: Remove the dead function destroy_irq() to fix build error	2014-10-27 01:43:57 +01:00
pmcs-msp71xx	MIPS: MSP71xx: Fix build error	2014-10-24 02:37:18 +02:00
pnx833x
power	nosave: consolidate __nosave_{begin,end} in <asm/sections.h>	2014-10-09 22:26:04 -04:00
ralink	MIPS: ralink: remove deprecated IRQF_DISABLED	2014-09-29 19:46:32 +02:00
rb532	Merge branch '3.16-fixes' into mips-for-linux-next	2014-08-02 00:07:03 +02:00
sgi-ip22	MIPS: IP22: Add missing put_device call	2014-07-30 13:27:51 +02:00
sgi-ip27	MIPS: IP27: Fix __node_distances undefined error	2014-11-19 18:22:07 +01:00
sgi-ip32
sibyte	MIPS: Sibyte: Include the swarm subdir to the sb1250 LittleSur builds	2014-10-23 13:52:49 +02:00
sni
txx9	driver:gpio remove all usage of gpio_remove retval in driver	2014-09-18 11:03:10 -07:00
vr41xx
Kbuild
Kbuild.platforms
Kconfig	MIPS: Kconfig: Add missing MIPS_CPS dependencies to PM and cpuidle	2014-10-23 19:58:05 +02:00
Kconfig.debug
Makefile	MIPS: Fix build with binutils 2.24.51+	2014-11-07 15:07:36 +01:00