David S. Miller 143c905494 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/i40e/i40e_main.c drivers/net/macvtap.c Both minor merge hassles, simple overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-12-18 16:42:06 -05:00
..
cgroup	cgroups: fix cgroup_event_listener error handling	2013-01-08 10:00:44 -08:00
firewire
hv	Tools: hv: use single send+recv buffer	2013-09-26 12:03:31 -07:00
include/tools	tools/include: use stdint types for user-space byteshift headers	2013-07-03 16:02:28 +02:00
lguest	tools/lguest: offer VIRTIO_F_ANY_LAYOUT for net device.	2013-07-15 11:18:32 +09:30
lib	tools lib traceevent: Fix conversion of pointer to integer of different size	2013-11-19 16:37:59 -03:00
net	bpf_exp: free duplicated labels at exit time	2013-12-17 17:11:00 -05:00
nfsd
perf	perf header: Fix possible memory leaks in process_group_desc()	2013-11-19 10:34:05 -03:00
power	cpupower: Fix segfault due to incorrect getopt_long arugments	2013-12-17 11:29:30 -08:00
scripts	tools: Harmonize the various build messages in perf, lib-traceevent, lib-lk	2013-10-11 12:18:08 -03:00
testing	H8/300 has been dead for several years, the kernel for it has	2013-11-12 14:13:14 +09: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/vm/page-types.c: support KPF_SOFTDIRTY bit	2013-11-13 12:09:07 +09:00
Makefile	tools/thermal: Introduce tmon, a tool for thermal subsystem	2013-11-07 08:45:34 +08:00