diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-31 11:32:31 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-05 16:30:01 -0500 |
commit | 9d45cf9e36bf9bcf16df6e1cbf049807c8402823 (patch) | |
tree | 2118a16701418af10d215d2174df7ee0a5cbe6bd /MAINTAINERS | |
parent | a146649bc19d5eba4f5bfac6720c5f252d517a71 (diff) | |
parent | 0cd5c3c80a0ebd68c08312fa7d8c13149cc61c4c (diff) |
Merge branch 'x86/urgent' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic merge:
arch/x86/kernel/irqinit_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index d992d407197b..cf0ab3af0de1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -2836,8 +2836,6 @@ S: Maintained | |||
2836 | MAC80211 | 2836 | MAC80211 |
2837 | P: Johannes Berg | 2837 | P: Johannes Berg |
2838 | M: johannes@sipsolutions.net | 2838 | M: johannes@sipsolutions.net |
2839 | P: Michael Wu | ||
2840 | M: flamingice@sourmilk.net | ||
2841 | L: linux-wireless@vger.kernel.org | 2839 | L: linux-wireless@vger.kernel.org |
2842 | W: http://linuxwireless.org/ | 2840 | W: http://linuxwireless.org/ |
2843 | T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git | 2841 | T: git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git |
@@ -4843,6 +4841,7 @@ P: Ingo Molnar | |||
4843 | M: mingo@redhat.com | 4841 | M: mingo@redhat.com |
4844 | P: H. Peter Anvin | 4842 | P: H. Peter Anvin |
4845 | M: hpa@zytor.com | 4843 | M: hpa@zytor.com |
4844 | M: x86@kernel.org | ||
4846 | L: linux-kernel@vger.kernel.org | 4845 | L: linux-kernel@vger.kernel.org |
4847 | 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 |
4848 | S: Maintained | 4847 | S: Maintained |