linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-11 14:26:34 +00:00

History

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

alpha: kernel: osf_sys: Set 'kts.tv_nsec' only when 'tv' has effect

2015-05-26 10:01:51 -07:00

arc

ARC: inline cache flush toggle helpers

2015-05-11 11:21:41 +05:30

arm

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-06-01 22:51:30 -07:00

arm64

ARM: SoC fixes for 4.1-rc3