---

yaml
---
r: 98111
b: refs/heads/master
c: 42a5a8a
h: refs/heads/master
i:
  98109: 76aa27a
  98107: 22b2ac9
  98103: ecbf32d
  98095: c2f2519
  98079: a98418a
  98047: 1c92244
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e374d17cd74ec5967f81e2b0c67ec3219a2bbbcc
+refs/heads/master: 42a5a8a60a093c359987fd884aec99b9d7f4c084

trunk/MAINTAINERS

@@ -274,7 +274,7 @@ S:      Maintained
 
 AD1889 ALSA SOUND DRIVER
 P:     Kyle McMartin
-M:     kyle@parisc-linux.org
+M:     kyle@mcmartin.ca
 P:     Thibaut Varene
 M:     T-Bone@parisc-linux.org
 W:     http://wiki.parisc-linux.org/AD1889
@@ -1827,7 +1827,7 @@ S:	Maintained
 
 HARMONY SOUND DRIVER
 P:	Kyle McMartin
-M:	kyle@parisc-linux.org
+M:	kyle@mcmartin.ca
 L:	linux-parisc@vger.kernel.org
 S:	Maintained
 
@@ -3120,7 +3120,7 @@ S:	Maintained
 
 PARISC ARCHITECTURE
 P:	Kyle McMartin
-M:	kyle@parisc-linux.org
+M:	kyle@mcmartin.ca
 P:	Matthew Wilcox
 M:	matthew@wil.cx
 P:	Grant Grundler
@@ -4023,7 +4023,7 @@ TULIP NETWORK DRIVERS
 P:	Grant Grundler
 M:	grundler@parisc-linux.org
 P:	Kyle McMartin
-M:	kyle@parisc-linux.org
+M:	kyle@mcmartin.ca
 L:	netdev@vger.kernel.org
 S:	Maintained