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
..
acpi	ACPICA: remove duplicate u8 typedef	2015-04-28 23:58:54 +02:00
asm-generic	TTY/Serial patches for 4.1-rc1	2015-04-21 09:33:10 -07:00
clocksource
crypto	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2015-04-15 10:42:15 -07:00
drm	drm/radeon: add new bonaire pci id	2015-05-12 13:42:46 -04:00
dt-bindings	clk: qcom: Add support for NSS/GMAC clocks and resets	2015-05-30 17:04:36 -07:00
keys
kvm
linux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
math-emu
media	Merge branch 'patchwork' into v4l_for_linus	2015-04-21 06:12:35 -03:00
memory
misc
net	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
pcmcia
ras
rdma	IB/core: Fix unaligned accesses	2015-05-05 13:21:27 -04:00
rxrpc
scsi	SCSI: add 1024 max sectors black list flag	2015-04-27 09:38:06 -07:00
soc
sound	ASoC: Fixes for v4.1	2015-04-30 19:08:06 +02:00
target	target: Use a PASSTHROUGH flag instead of transport_types	2015-05-30 19:58:11 -07:00
trace	tracing/mm: don't trace mm_page_pcpu_drain on offline cpus	2015-05-28 18:25:18 -07:00
uapi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-06-01 22:51:30 -07:00
video	fbdev changes for v4.1	2015-04-20 15:16:25 -07:00
xen	xen/events: don't bind non-percpu VIRQs with percpu chip	2015-05-19 19:55:36 +01:00
Kbuild