diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-10 12:36:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-10 12:36:45 -0700 |
| commit | a0c49b6b6729723f32208acb59946d29c72539c6 (patch) | |
| tree | f028c7139a95798b928d46d78bd3b23f07b6c5aa /MAINTAINERS | |
| parent | d55140ce3a7b36241171bd78c75a5ee85de20439 (diff) | |
| parent | a85fe3fce84335f83be17a7659bfbb3a71dc2fc4 (diff) | |
| download | linux-3.10-a0c49b6b6729723f32208acb59946d29c72539c6.tar.gz linux-3.10-a0c49b6b6729723f32208acb59946d29c72539c6.tar.bz2 linux-3.10-a0c49b6b6729723f32208acb59946d29c72539c6.zip | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc: Really fix build without CONFIG_PCI
powerpc: Fix build without CONFIG_PCI
powerpc/4xx: Fix build of PCI code on 405
powerpc/pseries: Simplify vpa deregistration functions
powerpc/pseries: Cleanup VPA registration and deregistration errors
powerpc/pseries: Fix kexec on recent firmware versions
MAINTAINERS: change maintainership of mpc5xxx
powerpc: Make KVM_GUEST default to n
powerpc/kvm: Fix build errors with older toolchains
powerpc: Lack of ibm,io-events not that important!
powerpc: Move kdump default base address to half RMO size on 64bit
powerpc/perf: Disable pagefaults during callchain stack read
ppc: Remove duplicate definition of PV_POWER7
powerpc: pseries: Fix kexec on machines with more than 4TB of RAM
powerpc: Jump label misalignment causes oops at boot
powerpc: Clean up some panic messages in prom_init
powerpc: Fix device tree claim code
powerpc: Return the_cpu_ spec from identify_cpu
powerpc: mtspr/mtmsr should take an unsigned long
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 51d42fbc8dc..1f8267f1a2a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3905,9 +3905,9 @@ F: arch/powerpc/platforms/powermac/ F: drivers/macintosh/ LINUX FOR POWERPC EMBEDDED MPC5XXX -M: Grant Likely <grant.likely@secretlab.ca> +M: Anatolij Gustschin <agust@denx.de> L: linuxppc-dev@lists.ozlabs.org -T: git git://git.secretlab.ca/git/linux-2.6.git +T: git git://git.denx.de/linux-2.6-agust.git S: Maintained F: arch/powerpc/platforms/512x/ F: arch/powerpc/platforms/52xx/ |