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	hv: hypervvssd: call endmntent before call setmntent again	2015-03-25 11:53:54 +01:00
iio	tools: iio: generic_buffer: Fix generic scale extraction	2015-03-28 11:01:49 +00:00
include	tools: Remove bitops/hweight usage of bits in tools/perf	2015-01-16 17:49:29 -03:00
lguest	tools/lguest: don't use legacy definitions for net device in example launcher.	2015-02-13 17:15:55 +10:30
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
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	tools lib traceevent: Add global QUIET_CC_FPIC build output	2013-12-19 16:18:10 -03:00
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	tools: add script to test udelay	2014-07-23 10:16:38 -07:00
usb	tools: ffs-aio-example: use endpoint addresses from descriptors	2015-01-15 09:41:49 -06:00
virtio	tools/virtio: add virtio 1.0 in vringh_test	2014-12-15 23:49:22 +02:00
vm	tools: Fix tools/vm build	2015-05-12 18:11:06 -03:00
Makefile	tools/liblockdep: Build liblockdep from tools/Makefile	2014-05-08 13:34:45 -04:00