diff --git a/[refs] b/[refs] index 59e32a404c15..c476de785ac2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b196872cd65a06ad65853c4513e0d0f24452d32e +refs/heads/master: b5b9df697b166948f2770fb65d1b8809637a199b diff --git a/trunk/CREDITS b/trunk/CREDITS index 5329ead9c672..606d407cfc15 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -45,7 +45,7 @@ S: Longford, Ireland S: Sydney, Australia N: Tigran A. Aivazian -E: tigran@veritas.com +E: tigran@aivazian.fsnet.co.uk W: http://www.moses.uklinux.net/patches D: BFS filesystem D: Intel IA32 CPU microcode update support diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index d708702aba2f..8732daeae303 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -493,7 +493,7 @@ S: Maintained BFS FILE SYSTEM P: Tigran A. Aivazian -M: tigran@veritas.com +M: tigran@aivazian.fsnet.co.uk L: linux-kernel@vger.kernel.org S: Maintained @@ -1513,7 +1513,7 @@ S: Maintained INTEL IA32 MICROCODE UPDATE SUPPORT P: Tigran Aivazian -M: tigran@veritas.com +M: tigran@aivazian.fsnet.co.uk S: Maintained INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT