David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: Documentation/devicetree/bindings/net/micrel-ks8851.txt net/core/netpoll.c The net/core/netpoll.c conflict is a bug fix in 'net' happening to code which is completely removed in 'net-next'. In micrel-ks8851.txt we simply have overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2014-03-25 20:29:20 -04:00
..
cgroup	cgroups: fix cgroup_event_listener error handling	2013-01-08 10:00:44 -08:00
firewire	tools/firewire: nosy-dump: check for allocation failure	2012-12-02 20:10:18 +01:00
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	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-03-14 22:31:55 -04:00
nfsd	NFSD: Added fault injection script	2011-11-07 21:10:47 -05:00
perf	perf bench: Fix NULL pointer dereference in "perf bench all"	2014-03-14 13:45:54 -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	tools/testing/selftests/ipc/msgque.c: handle msgget failure return correctly	2014-03-10 17:26:21 -07: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