Merge remote-tracking branch 'mugunthan/connectivity-ti-linux-3.14.y-cpsw'...
Merge remote-tracking branch 'mugunthan/connectivity-ti-linux-3.14.y-cpsw' into connectivity-ti-linux-3.14.y
Showing
- drivers/net/ethernet/ti/cpsw.c 185 additions, 17 deletionsdrivers/net/ethernet/ti/cpsw.c
- drivers/net/ethernet/ti/cpsw_ale.c 10 additions, 2 deletionsdrivers/net/ethernet/ti/cpsw_ale.c
- drivers/net/ethernet/ti/cpsw_ale.h 4 additions, 0 deletionsdrivers/net/ethernet/ti/cpsw_ale.h
- include/uapi/linux/Kbuild 1 addition, 0 deletionsinclude/uapi/linux/Kbuild
- include/uapi/linux/ethtool.h 4 additions, 0 deletionsinclude/uapi/linux/ethtool.h
- include/uapi/linux/net_switch_config.h 45 additions, 0 deletionsinclude/uapi/linux/net_switch_config.h
- include/uapi/linux/sockios.h 3 additions, 0 deletionsinclude/uapi/linux/sockios.h
- net/core/dev_ioctl.c 10 additions, 0 deletionsnet/core/dev_ioctl.c
Please register or sign in to comment