David S. Miller 64c27237a0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/marvell/mvneta.c The mvneta.c conflict is a case of overlapping changes, a conversion to devm_ioremap_resource() vs. a conversion to netdev_alloc_pcpu_stats. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-29 18:48:54 -04:00
..
acpi	Merge branches 'acpi-processor', 'acpi-hotplug', 'acpi-init', 'acpi-pm' and 'acpica'	2014-01-29 11:47:18 +01:00
asm-generic	mm: Use ptep/pmdp_set_numa() for updating _PAGE_NUMA bit	2014-02-17 11:19:36 +11:00
clocksource
crypto
drm	Merge tag 'ttm-fixes-3.14-2014-02-18' of git://people.freedesktop.org/~thomash/linux into drm-fixes	2014-02-19 08:21:26 +10:00
dt-bindings	clk: tegra124: remove gr2d and gr3d clocks	2014-02-20 19:10:58 +02:00
keys
kvm	ARM: KVM: fix non-VGIC compilation	2014-03-06 09:47:42 +01:00
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04:00
math-emu
media
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-29 18:48:54 -04:00
pcmcia
ras
rdma	IB: Report using RoCE IP based gids in port caps	2014-02-13 14:46:03 -08:00
rxrpc
scsi	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending	2014-01-31 15:31:23 -08:00
sound	ASoC: dapm: Add locking to snd_soc_dapm_xxxx_pin functions	2014-02-20 18:40:07 +09:00
target	iscsi/iser-target: Fix isert_conn->state hung shutdown issues	2014-03-04 17:54:09 -08:00
trace	net: Rename skb->rxhash to skb->hash	2014-03-26 15:58:20 -04:00
uapi	Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2014-03-25 19:25:39 -04:00
video
xen	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2014-02-14 10:45:18 -08:00
Kbuild