diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 16:58:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 16:58:50 -0500 |
commit | 647802d6db5f2e62e53f44bfdc61416547ba7f5b (patch) | |
tree | 57b24ba72db7a553a5d59d5aa5b5bd4f6ed940ac /MAINTAINERS | |
parent | 3e561f975cd6db846b2bbd684cd107a27f5d8aaa (diff) | |
parent | bb960a1e42042e82447a5bc0941b3ab6d614bac3 (diff) |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: APIC: enable workaround on AMD Fam10h CPUs
xen: disable interrupts before saving in percpu
x86: add x86@kernel.org to MAINTAINERS
x86: push old stack address on irqstack for unwinder
irq, x86: fix lock status with numa_migrate_irq_desc
x86: add cache descriptors for Intel Core i7
x86/Voyager: make it build and boot
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5bff376d297c..e022a5d04473 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -4841,6 +4841,7 @@ P: Ingo Molnar | |||
4841 | M: mingo@redhat.com | 4841 | M: mingo@redhat.com |
4842 | P: H. Peter Anvin | 4842 | P: H. Peter Anvin |
4843 | M: hpa@zytor.com | 4843 | M: hpa@zytor.com |
4844 | M: x86@kernel.org | ||
4844 | L: linux-kernel@vger.kernel.org | 4845 | L: linux-kernel@vger.kernel.org |
4845 | T: git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git | 4846 | T: git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git |
4846 | S: Maintained | 4847 | S: Maintained |