David S. Miller 22f10923dd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/amd/xgbe/xgbe-desc.c drivers/net/ethernet/renesas/sh_eth.c Overlapping changes in both conflict cases. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-12-10 15:48:20 -05:00
..
acpi	ACPI and power management updates for 3.18-rc2	2014-10-24 11:29:31 -07:00
asm-generic	net, lib: kill arch_fast_hash library bits	2014-12-10 15:17:46 -05:00
clocksource	…
crypto	crypto: LLVMLinux: Add macro to remove use of VLAIS in crypto code	2014-10-14 10:51:22 +02:00
drm	drm/radeon: remove invalid pci id	2014-10-28 10:44:36 -04:00
dt-bindings	The fixes for the clock framework are all regressions in drivers, plus a	2014-11-25 17:52:56 -08:00
keys	…
kvm	arm/arm64: KVM: Fix BE accesses to GICv2 EISR and ELRSR regs	2014-10-16 10:57:41 +02:00
linux	net, lib: kill arch_fast_hash library bits	2014-12-10 15:17:46 -05:00
math-emu	…
media	Merge branch 'patchwork' into v4l_for_linus	2014-10-09 14:00:54 -03:00
memory	…
misc	…
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
pcmcia	…
ras	…
rdma	IB/mlx5, iser, isert: Add Signature API additions	2014-10-09 00:10:53 -07:00
rxrpc	…
scsi	scsi: set REQ_QUEUE for the blk-mq case	2014-10-28 09:53:43 +01:00
soc/tegra	…
sound	ALSA: pcm: Add big-endian DSD sample formats and fix XMOS DSD sample format	2014-11-21 15:13:28 +01:00
target	…
trace	Merge branch 'urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/urgent	2014-10-30 07:37:37 +01:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-12-10 15:48:20 -05:00
video	fbdev changes for 3.18	2014-10-18 18:03:02 -07:00
xen	…
Kbuild	…