diff --git a/[refs] b/[refs] index 5dd404e82541..2d4f085c0b59 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa276f36f3d8743295e067fb483b42dca8bd1ece +refs/heads/master: fadfd2b6ba8838a6cc458dbae214993a177a3ee9 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 05a9a563042f..f3bbc759360c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/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