Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6a89e312a7b4ecde88d88c1f66a099f1f420df45..5783a80d3e05d5f3e4d731790cdd3a39d78879c9 100644 (file)
--- 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