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:
  [IA64] make pfm_get_task work with virtual pids
  [IA64] honor notify_die() returning NOTIFY_STOP
  [IA64] remove dead code: __cpu_{down,die} from !HOTPLUG_CPU
  [IA64] Appoint kvm/ia64 Maintainers
  [IA64] ia64_set_psr should use srlz.i
  [IA64] Export three symbols for module use
  [IA64] mca style cleanup
  [IA64] sn_hwperf semaphore to mutex
  [IA64] generalize attribute of fsyscall_gtod_data
  [IA64] efi.c Add /* never reached */ annotation
  [IA64] efi.c Spelling/punctuation fixes
  [IA64] Make efi.c mostly fit in 80 columns
  [IA64] aliasing-test: fix gcc warnings on non-ia64
  [IA64] Slim-down __clear_bit_unlock
  [IA64] Fix the order of atomic operations in restore_previous_kprobes on ia64
  [IA64] constify function pointer tables
  [IA64] fix userspace compile error in gcc_intrin.h

1 files changed, 9 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 548df4b0f62a..4f3da8b56979 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2249,6 +2249,15 @@ L:	kvm-devel@lists.sourceforge.net
 W:      kvm.sourceforge.net
 S:      Supported
 
+KERNEL VIRTUAL MACHINE For Itanium(KVM/IA64)
+P:      Anthony Xu
+M:      anthony.xu@intel.com
+P:      Xiantao Zhang
+M:      xiantao.zhang@intel.com
+L:      kvm-ia64-devel@lists.sourceforge.net
+W:      kvm.sourceforge.net
+S:      Supported
+
 KEXEC
 P:      Eric Biederman
 M:      ebiederm@xmission.com