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	ARM: SoC fixes for 3.18-rc5	2014-11-16 16:21:57 -08:00
common	dma: edma: move device registration to platform code	2014-11-05 18:26:10 -08:00
configs	The i.MX fixes for 3.18, 2nd round:	2014-11-04 20:37:25 -08:00
crypto
firmware
include	ARM: enable bpf syscall	2014-10-29 00:18:20 +00:00
kernel	separate kernel- and userland-side msghdr	2014-11-19 16:22:59 -05:00
kvm	Second batch of changes for KVM/{arm,arm64} for 3.18	2014-10-18 14:32:31 -07:00
lib
mach-at91	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2014-10-14 09:22:26 +02:00
mach-axxia
mach-bcm	Merge tag 'bcm63138-v4' of http://github.com/brcm/linux into next/soc	2014-09-25 23:50:02 +02:00
mach-berlin
mach-clps711x	ARM: SoC platform changes for 3.18	2014-10-08 17:13:04 -04:00
mach-cns3xxx	CNS3xxx: Fix PCIe read size limit.	2014-09-25 23:35:01 +02:00
mach-davinci	ARM: SoC DT updates for 3.18	2014-10-08 17:22:23 -04:00
mach-dove
mach-ebsa110	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
mach-efm32
mach-ep93xx	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
mach-exynos	Samsung fixes for v3.18	2014-10-14 23:31:13 -07:00
mach-footbridge	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
mach-gemini
mach-highbank	mailbox: rename pl320-ipc specific mailbox.h	2014-10-08 10:39:33 +05:30
mach-hisi	ARM: hisi: depend on ARCH_MULTI_V7	2014-10-02 16:40:10 +02:00
mach-imx	ARM: imx: clk-vf610: define PLL's clock tree	2014-11-04 13:40:14 +08:00
mach-integrator	PCI changes for the v3.18 merge window:	2014-10-09 15:03:49 -04:00
mach-iop13xx	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
mach-iop32x	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
mach-iop33x	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
mach-ixp4xx	ARM: ixp4xx: remove compilation warnings in io.h	2014-10-28 22:04:01 +01:00
mach-keystone
mach-ks8695	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
mach-lpc32xx
mach-mediatek
mach-meson	ARM: meson: add basic support for MesonX SoCs	2014-09-25 17:34:42 +02:00
mach-mmp	net: pxa168_eth: Fix providing of phy_interface mode on platform_data	2014-10-28 16:48:02 -04:00
mach-moxart
mach-msm
mach-mv78xx0
mach-mvebu	ARM: mvebu: armada xp: Generalize use of i2c quirk	2014-11-01 22:07:44 +00:00
mach-mxs
mach-netx
mach-nomadik
mach-nspire
mach-omap1
mach-omap2	The i.MX fixes for 3.18, 2nd round:	2014-11-04 20:37:25 -08:00
mach-orion5x
mach-picoxcell
mach-prima2
mach-pxa	ARM: pxa: fix hang on startup with DEBUG_LL	2014-10-20 21:11:40 +02:00
mach-qcom
mach-realview
mach-rockchip
mach-rpc	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
mach-s3c24xx	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2014-10-14 09:22:26 +02:00
mach-s3c64xx	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2014-10-14 09:22:26 +02:00
mach-s5pv210	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2014-10-14 09:22:26 +02:00
mach-sa1100	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2014-10-14 09:22:26 +02:00
mach-shmobile	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-10-14 09:39:08 +02:00
mach-socfpga	arm: socfpga: fix fetching cpu1start_addr for SMP	2014-10-21 14:04:14 -05:00
mach-spear
mach-sti
mach-sunxi
mach-tegra
mach-u300	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
mach-ux500
mach-versatile
mach-vexpress
mach-vt8500	arm, vt8500, LLVMLlinux: Use mcr instead of mcr% for mach-vt8500	2014-09-26 01:49:03 +02:00
mach-w90x900
mach-zynq	ACPI and power management updates for 3.18-rc1	2014-10-09 16:07:43 -04:00
mm	Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm	2014-11-15 15:45:07 -08:00
net	net: bpf: arm: make hole-faulting more robust	2014-09-23 12:40:22 -04:00
nwfpe
oprofile
plat-iop	kbuild: remove unnecessary variable initializaions	2014-10-02 13:55:02 +02:00
plat-omap	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2014-10-14 09:22:26 +02:00
plat-orion	ARM: orion: Fix for certain sequence of request_irq can cause irq storm	2014-11-01 22:07:45 +00:00
plat-pxa	ARM: pxa: ssp: provide platform_device_id for PXA3xx	2014-09-19 01:56:02 +08:00
plat-samsung	Samsung fixes for v3.18	2014-10-14 23:31:13 -07:00
plat-versatile
tools
vfp
xen
Kconfig	xen: features and fixes for 3.18-rc0	2014-10-11 20:29:01 -04:00
Kconfig-nommu
Kconfig.debug	ARM: pxa: fix hang on startup with DEBUG_LL	2014-10-20 21:11:40 +02:00
Makefile	Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild	2014-10-14 09:22:26 +02:00