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
firewire
hv
include/tools
lguest
lib
net	bpf_exp: free duplicated labels at exit time	2013-12-17 17:11:00 -05:00
nfsd
perf
power	cpupower: Fix segfault due to incorrect getopt_long arugments	2013-12-17 11:29:30 -08:00
scripts
testing
thermal/tmon
usb
virtio
vm
Makefile