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
..
cgroup
firewire
hv	Tools: hv: remove inclusion of linux/types.h	2013-12-08 22:47:12 -08:00
include	tools include: Include <linux/compiler.h> from asm/bug.h	2014-01-13 10:14:13 -03:00
lguest	tools/lguest: offer VIRTIO_F_ANY_LAYOUT for net device.	2013-07-15 11:18:32 +09:30
lib	tools/liblockdep: Use realpath for srctree and objtree	2014-02-26 21:22:01 -05:00
net	tools: bpf_dbg: various misc code cleanups	2014-02-24 19:02:10 -05:00
nfsd
perf	perf tools: Fix strict alias issue for find_first_bit	2014-02-28 10:39:40 -03:00
power	Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux	2014-02-02 11:28:48 -08:00
scripts	tools lib traceevent: Add global QUIET_CC_FPIC build output	2013-12-19 16:18:10 -03:00
testing	test: check copy_to/from_user boundary validation	2014-01-23 16:36:57 -08:00
thermal/tmon	tools/thermal: Introduce tmon, a tool for thermal subsystem	2013-11-07 08:45:34 +08:00
usb	usb: tools: fix a regression issue that gcc can't link to pthread	2013-12-04 15:10:54 -08:00
virtio	virtio_test: verify if virtqueue_kick() succeeded	2013-10-29 11:28:16 +10:30
vm	tools/: Convert to new topic libraries	2013-12-16 16:03:27 -03:00
Makefile	ACPI and power management updates for 3.14-rc1	2014-01-24 15:51:02 -08:00