Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
  [PARISC] lba_pci: pci_claim_resources disabled expansion roms
  [PARISC] print more than one character at a time for pdc console
  [PARISC] Update parisc-linux MAINTAINERS entries
  [PARISC] timer interrupt should not be IRQ_DISABLED
  Revert "[PARISC] import necessary bits of libgcc.a"

1 files changed, 4 insertions, 6 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 3002cc811c10..f3d7256bc74e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1681,8 +1681,7 @@ S:	Maintained
 HARMONY SOUND DRIVER
 P:      Kyle McMartin
 M:      kyle@parisc-linux.org
-W:      http://www.parisc-linux.org/~kyle/harmony/
-L:      parisc-linux@lists.parisc-linux.org
+L:      linux-parisc@vger.kernel.org
 S:      Maintained
 
 HAYES ESP SERIAL DRIVER
@@ -2890,16 +2889,15 @@ W:	http://www.torque.net/linux-pp.html
 S:      Maintained
 
 PARISC ARCHITECTURE
+P:      Kyle McMartin
+M:      kyle@parisc-linux.org
 P:      Matthew Wilcox
 M:      matthew@wil.cx
 P:      Grant Grundler
 M:      grundler@parisc-linux.org
-P:      Kyle McMartin
-M:      kyle@parisc-linux.org
-L:      parisc-linux@parisc-linux.org
+L:      linux-parisc@vger.kernel.org
 W:      http://www.parisc-linux.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
-T:      cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
 S:      Maintained
 
 PARAVIRT_OPS INTERFACE