Merge branch 'master' of git://gitorious.org/linux-can/linux-can-next
Conflicts: drivers/net/can/usb/ems_usb.c Minor dev_warn --> netdev_warn conversion conflicts.
Showing
想要评论请 注册 或 登录
Conflicts: drivers/net/can/usb/ems_usb.c Minor dev_warn --> netdev_warn conversion conflicts.