David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

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

2016-07-06 10:35:22 -07:00

..

boot

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

2016-06-30 05:03:36 -04:00

common

…

configs

Two fixes for v4.7 cycle for build issues:

2016-06-03 12:15:00 -07:00

crypto

…

firmware

…

include

tree wide: get rid of __GFP_REPEAT for order-0 allocations part I

2016-06-24 17:23:52 -07:00

kernel

Fixes for omaps for v4.7-rc cycle:

2016-06-18 22:57:48 -07:00

kvm

KVM: arm/arm64: Stop leaking vcpu pid references

2016-06-27 13:08:10 +02:00

lib

…

mach-alpine

…

mach-artpec

…

mach-asm9260

…

mach-aspeed

arm: Add Aspeed machine

2016-05-09 17:41:14 +09:30

mach-at91

…

mach-axxia

…

mach-bcm

…

mach-berlin

…

mach-clps711x

…

mach-cns3xxx

…

mach-davinci

ARM: DT updates for v4.7

2016-05-18 12:48:46 -07:00

mach-digicolor

…

mach-dove

…

mach-ebsa110

…

mach-efm32

…

mach-ep93xx

…

mach-exynos

Two fixes for v4.7 cycle for build issues:

2016-06-03 12:15:00 -07:00

mach-footbridge

…

mach-gemini

…

mach-highbank

…

mach-hisi

…

mach-imx

ARM: imx6ul: Fix Micrel PHY mask

2016-06-09 20:49:29 +08:00

mach-integrator

…

mach-iop13xx

…

mach-iop32x

…

mach-iop33x

…

mach-ixp4xx

…

mach-keystone

ARM: provide improved virt_to_idmap() functionality

2016-05-03 11:13:54 +01:00

mach-ks8695

…

mach-lpc18xx

…

mach-lpc32xx

ARM: lpc32xx: fix NR_IRQS confict

2016-05-24 19:32:46 +00:00

mach-mediatek

ARM: SoC driver updates for v4.7

2016-05-18 13:14:02 -07:00

mach-meson

…

mach-mmp

…

mach-moxart

…

mach-mv78xx0

…

mach-mvebu

…

mach-mxs

…

mach-netx

…

mach-nomadik

…

mach-nspire

…

mach-omap1

ARM: OMAP1: fix ams-delta FIQ handler to work with sparse IRQ

2016-06-17 02:37:36 -07:00

mach-omap2

Fixes for omaps for v4.7-rc cycle:

2016-06-18 22:57:48 -07:00

mach-orion5x

…

mach-oxnas

…

mach-picoxcell

…

mach-prima2

…

mach-pxa

ARM: SoC fixes for 4.7

2016-05-24 15:50:58 -07:00

mach-qcom

…

mach-realview

…

mach-rockchip

ARM: SoC cleanups and fixes for v4.7

2016-05-18 12:28:29 -07:00

mach-rpc

…

mach-s3c24xx

ARM: Explicitly apply PWM config extracted from pwm_args

2016-05-17 14:45:08 +02:00

mach-s3c64xx

…

mach-s5pv210

…

mach-sa1100

…

mach-shmobile

ARM: SoC driver updates for v4.7

2016-05-18 13:14:02 -07:00

mach-socfpga

* Altera Arria10 L2 cache and On-Chip RAM ECC handling. (Thor Thayer)

2016-05-16 18:44:39 -07:00

mach-spear

…

mach-sti

…

mach-stm32

…

mach-sunxi

…

mach-tango

…

mach-tegra

ARM: SoC driver updates for v4.7

2016-05-18 13:14:02 -07:00

mach-u300

…

mach-uniphier

ARM: SoC platform updates for v4.7

2016-05-18 12:35:46 -07:00

mach-ux500

…

mach-versatile

…

mach-vexpress

vexpress/spc: Remove CLK_IS_ROOT

2016-06-01 14:48:01 -07:00

mach-vt8500

…

mach-w90x900

…

mach-zx

…

mach-zynq

…

mm

lib/GCD.c: use binary GCD algorithm instead of Euclidean

2016-05-20 17:58:30 -07:00

net

…

nwfpe

…

oprofile

…

plat-iop

…

plat-omap

…

plat-orion

…

plat-pxa

…

plat-samsung

Two fixes for v4.7 cycle for build issues:

2016-06-03 12:15:00 -07:00

plat-versatile

…

probes

…

tools

…

vdso

…

vfp

exit_thread: accept a task parameter to be exited

2016-05-20 17:58:30 -07:00

xen

…

Kconfig

printk/nmi: generic solution for safe printk in NMI

2016-05-20 17:58:30 -07:00

Kconfig-nommu

…

Kconfig.debug

…

Makefile

…