linux/tools
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
firewire
hv
include
lguest
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
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
testing tools/testing/selftests/ipc/msgque.c: handle msgget failure return correctly 2014-03-10 17:26:21 -07:00
thermal/tmon
usb
virtio
vm
Makefile ACPI and power management updates for 3.14-rc1 2014-01-24 15:51:02 -08:00