diff options
| author | Olof Johansson <olof@lixom.net> | 2017-08-29 22:39:18 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-08-29 22:39:18 -0700 |
| commit | fabed5ad230a5ff8320b2928ec20a52e59a9bf60 (patch) | |
| tree | fadeb37aad19748ebae3806f7b80277993ae10eb /scripts/kconfig/conf.c | |
| parent | 93a4c8355e0e448d83f31801b4c72f66e4360975 (diff) | |
| parent | fe45174b72aead678da581bab9e9a37c9b26a070 (diff) | |
Merge tag 'sunxi-fixes-for-4.13-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Allwinner fixes for 4.13, take 3
This is a revert of the EMAC bindings. The discussion has not settled down
yet on a proper representation of the PHY, and therefore we cannot commit
to a binding yet
* tag 'sunxi-fixes-for-4.13-3' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
arm: dts: sunxi: Revert EMAC changes
arm64: dts: allwinner: Revert EMAC changes
dt-bindings: net: Revert sun8i dwmac binding
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'scripts/kconfig/conf.c')
0 files changed, 0 insertions, 0 deletions