David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/phy/amd-xgbe-phy.c drivers/net/wireless/iwlwifi/Kconfig include/net/mac80211.h iwlwifi/Kconfig and mac80211.h were both trivial overlapping changes. The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and the bug fix that happened on the 'net' side is already integrated into the rest of the amd-xgbe driver. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-06-01 22:51:30 -07:00
..
build	tools build: Add feature check for lzma library	2015-03-21 14:53:39 -03:00
cgroup
firewire
hv
iio
include
lguest
lib	Merge branch 'liblockdep-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux into perf/urgent	2015-05-15 08:43:15 +02:00
net	tools: bpf_jit_disasm: fix segfault on disabled debugging log output	2015-05-27 00:24:10 -04:00
nfsd	NFSD: Added fault injection script	2011-11-07 21:10:47 -05:00
perf	perf tools: Use getconf to determine number of online CPUs	2015-05-12 18:11:16 -03:00
power	tools/power turbostat: update version number to 4.7	2015-05-27 18:04:01 -04:00
scripts
testing	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-05-23 01:22:35 -04:00
thermal/tmon	tools/thermal: tmon: fixed the 'make install' command	2015-05-09 13:36:58 +08:00
time
usb
virtio
vm	tools: Fix tools/vm build	2015-05-12 18:11:06 -03:00
Makefile