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
..
af_unix.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
diag.c	VFS: net/unix: d_backing_inode() annotations	2015-04-15 15:06:56 -04:00
garbage.c	net: unix: garbage: fixed several comment and whitespace style issues	2015-04-23 13:15:20 -04:00
Kconfig
Makefile
sysctl_net_unix.c	net: Convert uses of typedef ctl_table to struct ctl_table	2013-06-13 02:36:09 -07:00