2 commits

Author	SHA1	Message	Date
David S. Miller	f188b951f3	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/renesas/ravb_main.c kernel/bpf/syscall.c net/ipv4/ipmr.c All three conflicts were cases of overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>	2015-12-03 21:09:12 -05:00
Kalle Valo	e705c12146	iwlwifi: move under intel vendor directory ... Part of reorganising wireless drivers directory and Kconfig. Signed-off-by: Kalle Valo <kvalo@codeaurora.org>	2015-11-18 14:28:30 +02:00