mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Merge branches 'master' and 'devel' into for-linus
Conflicts: arch/arm/Kconfig arch/arm/mm/Kconfig
This commit is contained in:
commit
0b019a4155
293 changed files with 16113 additions and 4687 deletions
21
MAINTAINERS
21
MAINTAINERS
|
|
@ -616,10 +616,10 @@ M: Richard Purdie <[email protected]>
|
|||
S: Maintained
|
||||
|
||||
ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
|
||||
M: Paulius Zaleckas <paulius.zaleckas@gmail.com>
|
||||
M: Hans Ulli Kroll <ulli.kroll@googlemail.com>
|
||||
L: [email protected] (moderated for non-subscribers)
|
||||
T: git git://gitorious.org/linux-gemini/mainline.git
|
||||
S: Odd Fixes
|
||||
T: git git://git.berlios.de/gemini-board
|
||||
S: Maintained
|
||||
F: arch/arm/mach-gemini/
|
||||
|
||||
ARM/EBSA110 MACHINE SUPPORT
|
||||
|
|
@ -641,9 +641,10 @@ T: topgit git://git.openezx.org/openezx.git
|
|||
F: arch/arm/mach-pxa/ezx.c
|
||||
|
||||
ARM/FARADAY FA526 PORT
|
||||
M: Paulius Zaleckas <paulius.zaleckas@gmail.com>
|
||||
M: Hans Ulli Kroll <ulli.kroll@googlemail.com>
|
||||
L: [email protected] (moderated for non-subscribers)
|
||||
S: Odd Fixes
|
||||
S: Maintained
|
||||
T: git://git.berlios.de/gemini-board
|
||||
F: arch/arm/mm/*-fa*
|
||||
|
||||
ARM/FOOTBRIDGE ARCHITECTURE
|
||||
|
|
@ -692,6 +693,13 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/kristoffer/linux-hpc.git
|
|||
F: arch/arm/mach-sa1100/jornada720.c
|
||||
F: arch/arm/mach-sa1100/include/mach/jornada720.h
|
||||
|
||||
ARM/INCOME PXA270 SUPPORT
|
||||
M: Marek Vasut <[email protected]>
|
||||
L: [email protected] (moderated for non-subscribers)
|
||||
S: Maintained
|
||||
F: arch/arm/mach-pxa/income.c
|
||||
F: arch/arm/mach-pxa/include/mach-pxa/income.h
|
||||
|
||||
ARM/INTEL IOP32X ARM ARCHITECTURE
|
||||
M: Lennert Buytenhek <[email protected]>
|
||||
M: Dan Williams <[email protected]>
|
||||
|
|
@ -947,8 +955,9 @@ ARM/SHMOBILE ARM ARCHITECTURE
|
|||
M: Paul Mundt <[email protected]>
|
||||
M: Magnus Damm <[email protected]>
|
||||
L: [email protected]
|
||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
|
||||
W: http://oss.renesas.com
|
||||
Q: http://patchwork.kernel.org/project/linux-sh/list/
|
||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git
|
||||
S: Supported
|
||||
F: arch/arm/mach-shmobile/
|
||||
F: drivers/sh/
|
||||
|
|
|
|||
Loading…
Reference in a new issue