[GIT PULL 3/3] Broadcom maintainers changes for 6.5

[Arnd Bergmann]

On Mon, Jun 19, 2023, at 15:49, Florian Fainelli wrote:
> The following changes since commit ac9a78681b921877518763ba0e89202254349d1b:
>
>   Linux 6.4-rc1 (2023-05-07 13:34:35 -0700)
>
> are available in the Git repository at:
>
>   https://github.com/Broadcom/stblinux.git tags/arm-soc/for-6.5/maintainers
>
> for you to fetch changes up to 825edae7d1c39171634253203f03cf6c6cf380bc:
>
>   MAINTAINERS: Replace my email address (2023-06-19 04:48:28 -0700)
>
> ----------------------------------------------------------------
> This pull request contains MAINTAINERS file updates for 6.5, please pull
> the following:
>
> - Justin, Kamal and Florian update their email to use their corporate
>   Broadcom email address

There was a small merge conflict against 80e62bc8487b0 ("MAINTAINERS:
re-sort all entries and fields"), should be all resolved now.

     Arnd