| commit | dda922c831d1661c11a3ae1051b7160236f6ffb0 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Mon Jun 01 22:33:25 2015 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Mon Jun 01 22:51:30 2015 -0700 |
| tree | 2fe588dbc4dc90addaabf303713fb2c6af0dc19b | |
| parent | db3397b9aa30d334be237170e048dcd96e1e951d [diff] | |
| parent | c46a024ea5eb0165114dbbc8c82c29b7bcf66e71 [diff] |
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>