David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/usb/asix_common.c
	drivers/net/usb/sr9800.c
	drivers/net/usb/usbnet.c
	include/linux/usb/usbnet.h
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

The TCP conflicts were overlapping changes.  In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.

With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.

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

2015-04-02 16:16:53 -04:00

..

boot

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

2015-04-02 16:16:53 -04:00

common

Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2014-12-14 16:10:09 -08:00

configs

ARM: vexpress: update CONFIG_USB_ISP1760 option

2015-03-11 15:37:21 +01:00

crypto

crypto: arm/aes update NEON AES module to latest OpenSSL version

2015-03-02 23:18:26 +13:00

firmware

…

include

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

2015-03-17 10:31:36 -07:00

kernel

ARM: 8313/1: Use read_cpuid_ext() macro instead of inline asm

2015-03-18 10:14:37 +00:00

kvm

arm64: KVM: Do not use pgd_index to index stage-2 pgd

2015-03-11 14:24:36 +01:00

lib

ARM: 8285/1: remove ARMv3 user access code again

2015-01-16 14:49:08 +00:00

mach-asm9260

clockevents: asm9260: Fix compilation error with sparc/sparc64 allyesconfig

2015-02-25 10:28:22 +01:00

mach-at91

ARM: at91: pm_slowclock: fix the compilation error

2015-03-11 15:49:47 +01:00

mach-axxia

ARM: make arrays containing machine compatible strings const

2015-02-19 09:44:17 +01:00

mach-bcm

ARM: make arrays containing machine compatible strings const

2015-02-19 09:44:17 +01:00

mach-berlin

…

mach-clps711x

…

mach-cns3xxx

Merge branch 'pci/config' into next

2015-02-02 14:49:29 -06:00

mach-davinci

ARM: make of_device_ids const

2015-02-19 09:44:25 +01:00

mach-digicolor

ARM: digicolor: select syscon and timer

2015-01-29 13:52:06 -08:00

mach-dove

…

mach-ebsa110

…

mach-efm32

…

mach-ep93xx

arm: ep93xx: add dma_masks for the M2P and M2M DMA controllers

2014-11-28 12:34:08 +01:00

mach-exynos

Merge tag 'samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

2015-03-04 21:01:25 +01:00

mach-footbridge

…

mach-gemini

…

mach-highbank

ARM: make arrays containing machine compatible strings const

2015-02-19 09:44:17 +01:00

mach-hisi

ARM: make arrays containing machine compatible strings const

2015-02-19 09:44:17 +01:00

mach-imx

ARM: imx: fix struct clk pointer comparing

2015-03-11 16:00:20 -07:00

mach-integrator

ARM: integrator: Convert PCI to use generic config accessors

2015-01-29 08:34:42 -06:00

mach-iop13xx

PCI/MSI: Rename mask/unmask_msi_irq treewide

2014-11-23 13:01:45 +01:00

mach-iop32x

…

mach-iop33x

…

mach-ixp4xx

ARM: ixp4xx: fix {in,out}s{bwl} data types

2015-02-18 12:20:27 +01:00

mach-keystone

ARM: make of_device_ids const

2015-02-19 09:44:25 +01:00

mach-ks8695

Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

2015-02-12 08:51:56 -08:00

mach-lpc32xx

…

mach-mediatek

ARM: mediatek: Add config options for mediatek SoCs.

2015-01-20 17:49:10 +01:00

mach-meson

…

mach-mmp

ARM: make of_device_ids const

2015-02-19 09:44:25 +01:00

mach-moxart

…

mach-msm

net: smc91x: use run-time configuration on all ARM machines

2015-02-28 12:56:56 -05:00

mach-mv78xx0

…

mach-mvebu

ARM: make of_device_ids const

2015-02-19 09:44:25 +01:00

mach-mxs

…

mach-netx

ARM: 8272/1: netx: Migrate DEBUG_LL macros to shared directory

2015-01-21 15:49:40 +00:00

mach-nomadik

…

mach-nspire

ARM: make arrays containing machine compatible strings const

2015-02-19 09:44:17 +01:00

mach-omap1

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

2015-02-17 09:17:33 -08:00

mach-omap2

ARM: OMAP2+: Fix socbus family info for AM33xx devices

2015-03-16 15:30:28 -07:00

mach-orion5x

…

mach-picoxcell

…

mach-prima2

ARM: make of_device_ids const

2015-02-19 09:44:25 +01:00

mach-pxa

Merge tag 'fixes-for-v4.0-rc5' of https://github.com/rjarzmik/linux into fixes

2015-03-29 13:47:37 -07:00

mach-qcom

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

2015-02-17 09:27:54 -08:00

mach-realview

net: smc91x: use run-time configuration on all ARM machines

2015-02-28 12:56:56 -05:00

mach-rockchip

ARM: rockchip: force built-in regulator support for PM

2015-02-18 12:20:30 +01:00

mach-rpc

…

mach-s3c24xx

ARM: SAMSUNG: remove unused DMA infrastructure

2015-01-24 13:09:54 +09:00

mach-s3c64xx

ARM: SAMSUNG: remove unused DMA infrastructure

2015-01-24 13:09:54 +09:00

mach-s5pv210

ARM: make arrays containing machine compatible strings const

2015-02-19 09:44:17 +01:00

mach-sa1100

ARM: fix typos in smc91x platform data

2015-03-04 23:32:26 -05:00

mach-shmobile

ARM: make arrays containing machine compatible strings const

2015-02-19 09:44:17 +01:00

mach-socfpga

ARM: socfpga: make sure socfpga_cpu1start_addr is properly flushed

2015-03-04 13:03:17 -06:00

mach-spear

…

mach-sti

ARM: STi: Add STiH410 SoC support

2015-03-11 15:34:45 +01:00

mach-sunxi

ARM: sunxi: Have ARCH_SUNXI select RESET_CONTROLLER for clock driver usage

2015-02-23 10:44:54 +01:00

mach-tegra

Merge tag 'clk-for-linus-3.20' of git://git.linaro.org/people/mike.turquette/linux

2015-02-21 12:30:30 -08:00

mach-u300

Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

2014-12-14 16:10:09 -08:00

mach-ux500

ARM: make of_device_ids const

2015-02-19 09:44:25 +01:00

mach-versatile

ARM: make arrays containing machine compatible strings const

2015-02-19 09:44:17 +01:00

mach-vexpress

ARM: vexpress: use ARM_CPU_SUSPEND if needed

2015-02-18 12:19:09 +01:00

mach-vt8500

…

mach-w90x900

…

mach-zynq

ARM: zynq: Simplify SLCR initialization

2015-01-29 15:38:17 +01:00

mm

ARM: 8311/1: Don't use is_module_addr in setting page attributes

2015-03-18 10:13:46 +00:00

net

…

nwfpe

…

oprofile

…

plat-iop

arm: iop: specify PMUs are for XScale CPUs

2015-02-06 00:12:59 -08:00

plat-omap

ARM: OMAP: dmtimer: disable pm runtime on remove

2015-03-17 10:44:58 -07:00

plat-orion

Merge tag 'pm+acpi-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

2014-12-10 21:17:00 -08:00

plat-pxa

…

plat-samsung

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

2015-02-17 09:27:54 -08:00

plat-versatile

ARM: vexpress: Remove non-DT code

2014-11-28 16:08:16 +01:00

probes

ARM: kprobes: Fix compilation error caused by superfluous '*'

2015-02-10 15:05:30 +08:00

tools

…

vfp

…

xen

xen/grant-table: pre-populate kernel unmap ops for xen_gnttab_unmap_refs()

2015-01-28 14:03:10 +00:00

Kconfig

ARM: pxa: fix pxa interrupts handling in DT

2015-02-23 22:40:48 +01:00

Kconfig-nommu

…

Kconfig.debug

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

2015-02-17 09:27:54 -08:00

Makefile

ARM: digicolor: add the machine directory to Makefile

2015-03-11 15:36:34 +01:00