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
..
alpha
arc
arm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
arm64
avr32
blackfin
c6x
cris
frv
hexagon
ia64
m32r
m68k
metag
microblaze
mips
mn10300
nios2
openrisc
parisc
powerpc
s390
score
sh
sparc	sparc: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE	2015-05-31 22:15:01 -07:00
tile
um
unicore32
x86	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
xtensa
.gitignore
Kconfig