diff options
| author | Stefan Agner <stefan@agner.ch> | 2014-10-03 16:06:58 +0200 |
|---|---|---|
| committer | Stefan Agner <stefan@agner.ch> | 2014-10-03 16:06:58 +0200 |
| commit | deb99a56793e1e0a3b802f7df1d8892f0577fd9c (patch) | |
| tree | 429f8c9601d3a8f111eefed12a37d19219c2dec7 /drivers/net/ethernet/aeroflex/greth.h | |
| parent | 30441ba8de547c2056fe7dbfd7a0a61a4d9ad3d7 (diff) | |
| parent | 802f18967234d417f3c654632adf5f1ef3f642a0 (diff) | |
Merge branch 'vf610-nfc' into toradex_vf_3.17_next
Conflicts:
arch/arm/boot/dts/vf610-colibri-eval-v3.dts
arch/arm/boot/dts/vf610-colibri.dtsi
arch/arm/boot/dts/vf610-twr.dts
arch/arm/boot/dts/vf610.dtsi
Diffstat (limited to 'drivers/net/ethernet/aeroflex/greth.h')
0 files changed, 0 insertions, 0 deletions