David S. Miller 67ddc87f16 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/ath/ath9k/recv.c drivers/net/wireless/mwifiex/pcie.c net/ipv6/sit.c The SIT driver conflict consists of a bug fix being done by hand in 'net' (missing u64_stats_init()) whilst in 'net-next' a helper was created (netdev_alloc_pcpu_stats()) which takes care of this. The two wireless conflicts were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-05 20:32:02 -05: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
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
math-emu
media
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05: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	target: Simplify command completion by removing CMD_T_FAILED flag	2014-02-12 15:14:30 -08:00
trace	Revert "writeback: do not sync data dirtied after sync start"	2014-02-22 02:02:28 +01:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-05 20:32:02 -05:00
video
xen	Merge branch 'for-linus' of git://git.kernel.dk/linux-block	2014-02-14 10:45:18 -08:00
Kbuild