diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 19:01:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 19:01:52 -0700 |
commit | 58580c86450bc09ff101f0d23fd8a162c146bc64 (patch) | |
tree | 31f2c19c768c35d1f8268dea509e2fc688d0a50e /MAINTAINERS | |
parent | 6086071005674eb982d898c75269c931240154cf (diff) | |
parent | fadfd2b6ba8838a6cc458dbae214993a177a3ee9 (diff) | |
download | blackbird-op-linux-58580c86450bc09ff101f0d23fd8a162c146bc64.tar.gz blackbird-op-linux-58580c86450bc09ff101f0d23fd8a162c146bc64.zip |
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 IA64 (Itanium) PLATFORM P: Tony Luck +P: Fenghua Yu M: tony.luck@intel.com +M: fenghua.yu@intel.com L: linux-ia64@vger.kernel.org W: http://www.ia64-linux.org/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git |