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
..
amd	arm64: amd-seattle: Fix PCI bus range due to SMMU limitation	2014-12-04 17:10:34 +01:00
apm	dtb: xgene: Add interrupt for Tx completion	2015-03-27 14:18:48 -07:00
arm	arm64: juno: Fix misleading name of UART reference clock	2015-03-29 13:56:08 -07:00
cavium	dts, arm64: Move dts files to vendor subdirs	2014-10-21 18:06:59 +02:00
exynos	arm64: dts: Add nodes for mmc, i2c, rtc, watchdog, adc on exynos7	2014-12-23 00:19:08 +09:00
freescale	arm64: Add DTS support for FSL's LS2085A SoC	2015-01-27 15:11:00 -08:00
include	arm64: Create link to include/dt-bindings to enable C preprocessor use.	2014-11-20 17:51:09 +01:00
mediatek	arm64: dts: Add mediatek MT8173 SoC and evaluation board dts and Makefile	2015-01-26 12:34:07 +01:00
.gitignore
Makefile	ARM: SoC 64-bit changes and additions	2015-02-17 09:47:46 -08:00
skeleton.dtsi	arm64: vexpress: Add dts files for the ARMv8 RTSM models	2013-04-26 14:32:03 +01:00