David S. Miller 0ddead90b2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The conflicts were two cases of overlapping changes in
batman-adv and the qed driver.

Signed-off-by: David S. Miller <davem@davemloft.net>

2017-06-15 11:59:32 -04:00

..

boot

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-06-15 11:59:32 -04:00

common

ARM: 8675/1: MCPM: ensure not to enter __hyp_soft_restart from loopback and cpu_power_down

2017-05-23 17:26:08 +01:00

configs

arm: multi_v7: Enable dwmac-sun8i driver on multi_v7_defconfig

2017-06-01 14:53:09 -04:00

crypto

…

firmware

…

include

Merge tag 'iommu-fixes-v4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

2017-06-09 22:30:55 -07:00

kernel

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

2017-05-11 11:27:54 -07:00

kvm

arm: KVM: Allow unaligned accesses at HYP

2017-06-06 22:20:02 +02:00

lib

…

mach-alpine

…

mach-artpec

…

mach-asm9260

…

mach-aspeed

…

mach-at91

Merge tag 'at91-4.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into fixes

2017-06-01 17:07:31 -07:00

mach-axxia

…

mach-bcm

ARM: remove duplicate 'const' annotations'

2017-05-19 10:12:55 +02:00

mach-berlin

…

mach-clps711x

…

mach-cns3xxx

ARM: remove duplicate 'const' annotations'

2017-05-19 10:12:55 +02:00

mach-davinci

ARM: davinci: PM: Do not free useful resources in normal path in 'davinci_pm_init'

2017-05-17 15:25:18 +05:30

mach-digicolor

…

mach-dove

…

mach-ebsa110

…

mach-efm32

…

mach-ep93xx

…

mach-exynos

…

mach-footbridge

…

mach-gemini

…

mach-highbank

…

mach-hisi

…

mach-imx

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-05-09 10:01:15 -07:00

mach-integrator

…

mach-iop13xx

…

mach-iop32x

…

mach-iop33x

…

mach-ixp4xx

scripts/spelling.txt: add regsiter -> register spelling mistake

2017-05-08 17:15:13 -07:00

mach-keystone

…

mach-ks8695

…

mach-lpc18xx

…

mach-lpc32xx

…

mach-mediatek

…

mach-meson

…

mach-mmp

…

mach-moxart

…

mach-mv78xx0

…

mach-mvebu

…

mach-mxs

…

mach-netx

…

mach-nomadik

…

mach-nspire

…

mach-omap1

…

mach-omap2

ARM: remove duplicate 'const' annotations'

2017-05-19 10:12:55 +02:00

mach-orion5x

…

mach-oxnas

…

mach-picoxcell

…

mach-prima2

…

mach-pxa

…

mach-qcom

…

mach-realview

…

mach-rockchip

…

mach-rpc

…

mach-s3c24xx

…

mach-s3c64xx

regulator: arizona-ldo1: Move pdata into a separate structure

2017-04-25 16:36:32 +01:00

mach-s5pv210

…

mach-sa1100

…

mach-shmobile

…

mach-socfpga

…

mach-spear

ARM: remove duplicate 'const' annotations'

2017-05-19 10:12:55 +02:00

mach-sti

…

mach-stm32

…

mach-sunxi

…

mach-tango

…

mach-tegra

…

mach-u300

…

mach-uniphier

…

mach-ux500

…

mach-versatile

…

mach-vexpress

…

mach-vt8500

…

mach-w90x900

…

mach-zx

…

mach-zynq

…

mm

arm: dma-mapping: Reset the device's dma_ops

2017-05-30 11:31:34 +02:00

net

arm: use set_memory.h header

2017-05-08 17:15:13 -07:00

nwfpe

…

oprofile

…

plat-iop

…

plat-omap

…

plat-orion

…

plat-pxa

…

plat-samsung

…

plat-versatile

…

probes

…

tools

…

vdso

…

vfp

…

xen

xen: Implement EFI reset_system callback

2017-05-02 12:06:50 +02:00

Kconfig

Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2017-05-09 09:49:36 -07:00

Kconfig-nommu

…

Kconfig.debug

…

Makefile

…