diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 01:59:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 01:59:39 -0400 |
| commit | 184475029a724b6b900d88fc3a5f462a6107d5af (patch) | |
| tree | 408320b46df221a2424bf94282b1b8e5b7aff7a1 /MAINTAINERS | |
| parent | 3b76eefe0f970c2e19f165d4a1650abc523d10bc (diff) | |
| parent | f1f4ee01c0d3dce0e3aa7d04e4332677db7af478 (diff) | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (99 commits)
drivers/virt: add missing linux/interrupt.h to fsl_hypervisor.c
powerpc/85xx: fix mpic configuration in CAMP mode
powerpc: Copy back TIF flags on return from softirq stack
powerpc/64: Make server perfmon only built on ppc64 server devices
powerpc/pseries: Fix hvc_vio.c build due to recent changes
powerpc: Exporting boot_cpuid_phys
powerpc: Add CFAR to oops output
hvc_console: Add kdb support
powerpc/pseries: Fix hvterm_raw_get_chars to accept < 16 chars, fixing xmon
powerpc/irq: Quieten irq mapping printks
powerpc: Enable lockup and hung task detectors in pseries and ppc64 defeconfigs
powerpc: Add mpt2sas driver to pseries and ppc64 defconfig
powerpc: Disable IRQs off tracer in ppc64 defconfig
powerpc: Sync pseries and ppc64 defconfigs
powerpc/pseries/hvconsole: Fix dropped console output
hvc_console: Improve tty/console put_chars handling
powerpc/kdump: Fix timeout in crash_kexec_wait_realmode
powerpc/mm: Fix output of total_ram.
powerpc/cpufreq: Add cpufreq driver for Momentum Maple boards
powerpc: Correct annotations of pmu registration functions
...
Fix up trivial Kconfig/Makefile conflicts in arch/powerpc, drivers, and
drivers/cpufreq
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 846f70ddc8db..f5474304e7ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3895,7 +3895,7 @@ F: arch/powerpc/platforms/512x/ | |||
| 3895 | F: arch/powerpc/platforms/52xx/ | 3895 | F: arch/powerpc/platforms/52xx/ |
| 3896 | 3896 | ||
| 3897 | LINUX FOR POWERPC EMBEDDED PPC4XX | 3897 | LINUX FOR POWERPC EMBEDDED PPC4XX |
| 3898 | M: Josh Boyer <jwboyer@linux.vnet.ibm.com> | 3898 | M: Josh Boyer <jwboyer@gmail.com> |
| 3899 | M: Matt Porter <mporter@kernel.crashing.org> | 3899 | M: Matt Porter <mporter@kernel.crashing.org> |
| 3900 | W: http://www.penguinppc.org/ | 3900 | W: http://www.penguinppc.org/ |
| 3901 | L: linuxppc-dev@lists.ozlabs.org | 3901 | L: linuxppc-dev@lists.ozlabs.org |
| @@ -3927,6 +3927,7 @@ W: http://www.penguinppc.org/ | |||
| 3927 | L: linuxppc-dev@lists.ozlabs.org | 3927 | L: linuxppc-dev@lists.ozlabs.org |
| 3928 | S: Maintained | 3928 | S: Maintained |
| 3929 | F: arch/powerpc/platforms/83xx/ | 3929 | F: arch/powerpc/platforms/83xx/ |
| 3930 | F: arch/powerpc/platforms/85xx/ | ||
| 3930 | 3931 | ||
| 3931 | LINUX FOR POWERPC PA SEMI PWRFICIENT | 3932 | LINUX FOR POWERPC PA SEMI PWRFICIENT |
| 3932 | M: Olof Johansson <olof@lixom.net> | 3933 | M: Olof Johansson <olof@lixom.net> |