diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 22:01:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 22:01:52 -0400 |
| commit | 58580c86450bc09ff101f0d23fd8a162c146bc64 (patch) | |
| tree | 31f2c19c768c35d1f8268dea509e2fc688d0a50e /MAINTAINERS | |
| parent | 6086071005674eb982d898c75269c931240154cf (diff) | |
| parent | fadfd2b6ba8838a6cc458dbae214993a177a3ee9 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
Add Fenghua Yu as temporary co-maintainer for ia64
[IA64] address compiler warnings perfmon.c/salinfo.c
[IA64] Remove unnecessary semicolons
[IA64] sprintf should not be used with same source & destination address
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6a89e312a7b4..5783a80d3e05 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2851,7 +2851,9 @@ S: Maintained | |||
| 2851 | 2851 | ||
| 2852 | IA64 (Itanium) PLATFORM | 2852 | IA64 (Itanium) PLATFORM |
| 2853 | P: Tony Luck | 2853 | P: Tony Luck |
| 2854 | P: Fenghua Yu | ||
| 2854 | M: tony.luck@intel.com | 2855 | M: tony.luck@intel.com |
| 2856 | M: fenghua.yu@intel.com | ||
| 2855 | L: linux-ia64@vger.kernel.org | 2857 | L: linux-ia64@vger.kernel.org |
| 2856 | W: http://www.ia64-linux.org/ | 2858 | W: http://www.ia64-linux.org/ |
| 2857 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git | 2859 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git |