Merge branch 'mrvl-prestera' of https://github.com/PLVision/linux-firmware

Signed-off-by: Josh Boyer <jwboyer@kernel.org>
5 years ago · 4d916641f0
2 changed files with 8 additions and 0 deletions
--- a/8
+++ b/8
@ -5032,3 +5032,11 @@ Derived from proprietary unpublished source code.
				@@ -5032,3 +5032,11 @@ Derived from proprietary unpublished source code.
 Permission is hereby granted for the distribution of this firmware
 as part of Linux or other Open Source operating system kernel,
 provided this copyright notice is accompanying it.
+
+------------------------------------------------
+
+Driver: prestera - Marvell driver for Prestera family ASIC devices
+
+File: mrvl/prestera/mvsw_prestera_fw-v2.0.img
+
+Licence: Redistributable. See LICENCE.Marvell for details.
--- a/mrvl/prestera/mvsw_prestera_fw-v2.0.img
+++ b/mrvl/prestera/mvsw_prestera_fw-v2.0.img