diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-14 09:55:01 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-01-14 09:55:01 +1100 |
commit | be6bfc29bc759670fb3a2519325c4ab2edf259c9 (patch) | |
tree | e4ffd461d48ecd984b6f250834dcccf099b1f6b9 /MAINTAINERS | |
parent | a61674bdfc7c2bf909c4010699607b62b69b7bec (diff) | |
parent | 44451d4d8f0e35153b3e7e3d40e198f2cf9ac36a (diff) |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux into next
Freescale updates from Scott:
"Highlights include moving QE code out of arch/powerpc (to be shared with
arm), device tree updates, and minor fixes."
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 050d0e77a2cf..124dd3795475 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4489,8 +4489,9 @@ F: include/linux/fs_enet_pd.h FREESCALE QUICC ENGINE LIBRARY L: linuxppc-dev@lists.ozlabs.org S: Orphan -F: arch/powerpc/sysdev/qe_lib/ -F: arch/powerpc/include/asm/*qe.h +F: drivers/soc/fsl/qe/ +F: include/soc/fsl/*qe*.h +F: include/soc/fsl/*ucc*.h FREESCALE USB PERIPHERAL DRIVERS M: Li Yang <leoli@freescale.com> @@ -6428,7 +6429,7 @@ S: Maintained F: arch/powerpc/platforms/8xx/ LINUX FOR POWERPC EMBEDDED PPC83XX AND PPC85XX -M: Scott Wood <scottwood@freescale.com> +M: Scott Wood <oss@buserror.net> M: Kumar Gala <galak@kernel.crashing.org> W: http://www.penguinppc.org/ L: linuxppc-dev@lists.ozlabs.org |