Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

No conflicts.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2021-10-07 15:24:06 -07:00
265 changed files with 2795 additions and 1910 deletions

View File

@@ -48,6 +48,8 @@ struct omap_usb_config {
u32 (*usb2_init)(unsigned nwires, unsigned alt_pingroup);
int (*ocpi_enable)(void);
void (*lb_reset)(void);
};
#endif /* __LINUX_USB_OMAP1_H */