David S. Miller 6e03f896b5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/vxlan.c drivers/vhost/net.c include/linux/if_vlan.h net/core/dev.c The net/core/dev.c conflict was the overlap of one commit marking an existing function static whilst another was adding a new function. In the include/linux/if_vlan.h case, the type used for a local variable was changed in 'net', whereas the function got rewritten to fix a stacked vlan bug in 'net-next'. In drivers/vhost/net.c, Al Viro's iov_iter conversions in 'net-next' overlapped with an endainness fix for VHOST 1.0 in 'net'. In drivers/net/vxlan.c, vxlan_find_vni() added a 'flags' parameter in 'net-next' whereas in 'net' there was a bug fix to pass in the correct network namespace pointer in calls to this function. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-02-05 14:33:28 -08:00
..
arc	…
arm	devicetree: document ARM bindings for QEMU's Firmware Config interface	2015-01-13 13:55:40 -06:00
ata	USB patches for 3.19-rc1	2014-12-14 14:57:16 -08:00
bus	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-12-11 14:27:06 -08:00
c6x	…
clock	Please consider pulling the clk framework changes toward 3.19. It is	2014-12-20 16:42:36 -08:00
cpufreq	…
crypto	crypto: sahara - add support for i.MX53	2014-12-03 22:30:18 +08:00
dma	Documentation: devicetree: Fix Xilinx VDMA specification	2014-12-05 22:23:36 +05:30
drm	…
extcon	…
fb	…
fuse	…
gpio	gpio: pl061: document gpio-ranges property for bindings file	2014-12-03 14:46:27 +01:00
gpu	drm: sti: add HQVDP plane	2014-12-11 14:00:13 +01:00
hid	…
hsi	…
hwmon	…
hwrng	…
i2c	i2c: st: Rename clock reference to something that exists	2015-01-24 05:43:43 +01:00
iio	…
input	Input: stmpe - enforce device tree only mode	2014-12-15 21:46:12 -08:00
interrupt-controller	Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus	2014-12-11 17:56:37 -08:00
iommu	…
leds	…
lpddr2	…
mailbox	…
media	[media] rcar_vin: Add DT support for r8a7793 and r8a7794 SoCs	2014-12-12 10:28:29 -02:00
memory-controllers	ARM: SoC driver updates for 3.19	2014-12-09 14:48:22 -08:00
metag	…
mfd	…
mipi	…
mips	…
misc	…
mmc	…
mtd	…
net	net/fsl_pq_mdio: Document supported compatibles	2015-02-03 16:11:39 -08:00
nios2	nios2: Device tree support	2014-12-08 12:56:01 +08:00
nvec	…
panel	…
pci	PCI changes for the v3.19 merge window:	2014-12-10 20:58:52 -08:00
phy	phy: miphy365x: Pass sysconfig register offsets via syscfg dt property.	2015-01-11 18:53:34 -05:00
pinctrl	Pin control changes for the v3.19 series:	2014-12-11 10:43:14 -08:00
power	…
power_supply	…
powerpc	…
pps	…
pwm	…
regmap	…
regulator	Merge remote-tracking branches 'regulator/topic/sky81452' and 'regulator/topic/stub' into regulator-next	2014-12-05 11:14:43 +00:00
reserved-memory	…
reset	…
rng	…
rtc	powerpc updates for 3.19	2014-12-11 17:48:14 -08:00
serial	TTY/Serial driver patches for 3.19-rc1	2014-12-14 15:23:32 -08:00
serio	…
soc	…
sound	Merge remote-tracking branches 'asoc/topic/wm8955', 'asoc/topic/wm8960', 'asoc/topic/wm8961', 'asoc/topic/wm8962' and 'asoc/topic/wm8974' into asoc-next	2014-12-08 13:12:30 +00:00
spi	Merge remote-tracking branches 'spi/topic/mxs', 'spi/topic/pxa', 'spi/topic/rockchip', 'spi/topic/samsung' and 'spi/topic/sirf' into spi-next	2014-12-08 12:17:17 +00:00
spmi	…
staging/iio/adc	…
thermal	…
timer	Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	2014-12-10 08:18:32 -08:00
ufs	…
usb	…
video	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2014-12-15 15:52:01 -08:00
virtio	…
w1	…
watchdog	…
x86	…
xillybus	…
ABI.txt	…
btmrvl.txt	…
chosen.txt	of: Add bindings for chosen node, stdout-path	2014-12-03 23:12:35 +00:00
eeprom.txt	…
graph.txt	Documentation: of: fix typo in graph bindings	2015-01-13 13:55:22 -06:00
marvell.txt	…
open-pic.txt	…
resource-names.txt	…
submitting-patches.txt	…
unittest.txt	…
vendor-prefixes.txt	devicetree: document the "qemu" and "virtio" vendor prefixes	2015-01-13 13:55:40 -06:00
xilinx.txt	…