linux/tools
David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/ethernet/altera/altera_sgdma.c
	net/netlink/af_netlink.c
	net/sched/cls_api.c
	net/sched/sch_api.c

The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces.  These were simple transformations from
netlink_capable to netlink_ns_capable.

The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-12 13:19:14 -04:00
..
cgroup
firewire
hv Tools: hv: Handle the case when the target file exists correctly 2014-04-16 14:10:36 -07:00
include perf tools: Move hash.h header 2014-02-18 09:34:49 -03:00
lguest tools/lguest: offer VIRTIO_F_ANY_LAYOUT for net device. 2013-07-15 11:18:32 +09:30
lib perf tools: Remove extra '/' character in events file path 2014-04-30 17:02:24 +02:00
net Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-05-12 13:19:14 -04:00
nfsd
perf perf tests x86: Fix stack map lookup in dwarf unwind test 2014-04-30 17:02:31 +02:00
power tools/power/acpi: Minor bugfixes 2014-04-21 22:51:58 +02:00
scripts tools lib traceevent: Add global QUIET_CC_FPIC build output 2013-12-19 16:18:10 -03:00
testing net: filter: BPF testsuite 2014-05-12 00:23:55 -04: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 tools/virtio: add a missing ) 2014-03-13 11:23:25 +10:30
vm tools/vm/page-types.c: page-cache sniffing feature 2014-04-07 16:35:52 -07:00
Makefile Adding makefile for tools/hv 2014-02-15 11:52:35 -08:00