David S. Miller c85d6975ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/mellanox/mlx4/cmd.c net/core/fib_rules.c net/ipv4/fib_frontend.c The fib_rules.c and fib_frontend.c conflicts were locking adjustments in 'net' overlapping addition and removal of code in 'net-next'. The mlx4 conflict was a bug fix in 'net' happening in the same place a constant was being replaced with a more suitable macro. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-04-06 22:34:15 -04:00
..
acpi	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux	2015-02-19 11:28:36 -08:00
asm-generic	OK, this has the big virtio 1.0 implementation, as specified by OASIS.	2015-02-18 09:24:01 -08:00
clocksource
crypto	crypto: af_alg - Allow to link sgl	2015-03-23 16:41:37 -04:00
drm	drm/ttm: device address space != CPU address space	2015-03-05 09:04:39 +10:00
dt-bindings	ARM: dts: am43xx: fix SLEWCTRL_FAST pinctrl binding	2015-03-06 09:21:03 -08:00
keys
kvm	arm/arm64: KVM: Keep elrsr/aisr in sync with software model	2015-03-14 13:42:07 +01:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-06 22:34:15 -04:00
math-emu
media
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-06 22:34:15 -04:00
pcmcia
ras
rdma
rxrpc
scsi
soc	pm: at91: Workaround DDRSDRC self-refresh bug with LPDDR1 memories.	2015-03-03 19:43:59 +01:00
sound
target	target: do not reject FUA CDBs when write cache is enabled but emulate_write_cache is 0	2015-03-19 23:26:46 -07:00
trace	regmap: introduce regmap_name to fix syscon regmap trace events	2015-03-19 20:04:55 +00:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-04-06 22:34:15 -04:00
video	OMAPDSS: fix regression with display sysfs files	2015-02-26 10:23:15 +02:00
xen	xen: Remove trailing semicolon from xenbus_register_frontend() definition	2015-03-02 10:38:59 +00:00
Kbuild