diff options
| author | David S. Miller <davem@davemloft.net> | 2015-06-01 22:33:25 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-06-01 22:51:30 -0700 |
| commit | 451818dd9b451e07fe0a87317c6d5ffbe016a5be (patch) | |
| tree | 816e91bb6f577ed4dfe28773c611c74a331ef57a /crypto/internal.h | |
| parent | 81e2c0b145e1fb9f986a485189a81d779c5b86d4 (diff) | |
| parent | 491fba88036f54220ebdbb2d0fc54e17f68c6d7e (diff) | |
| download | linux-crypto-451818dd9b451e07fe0a87317c6d5ffbe016a5be.tar.gz linux-crypto-451818dd9b451e07fe0a87317c6d5ffbe016a5be.zip | |
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>
Diffstat (limited to 'crypto/internal.h')
0 files changed, 0 insertions, 0 deletions