manual update from upstream:

Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4
to new location of swiotlb.c

Signed-off-by: Tony Luck <tony.luck@intel.com>

1 files changed, 35 insertions, 15 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 767fb610963e..983f9e9aed61 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -116,12 +116,6 @@ M:	ajk@iehk.rwth-aachen.de
 L:      linux-hams@vger.kernel.org
 S:      Maintained
 
-YEALINK PHONE DRIVER
-P:      Henk Vergonet
-M:      Henk.Vergonet@gmail.com
-L:      usbb2k-api-dev@nongnu.org
-S:      Maintained
-
 8139CP 10/100 FAST ETHERNET DRIVER
 P:      Jeff Garzik
 M:      jgarzik@pobox.com
@@ -197,6 +191,15 @@ M:	Thorsten Knabe <linux@thorsten-knabe.de>
 W:      http://linux.thorsten-knabe.de
 S:      Maintained
 
+AD1889 SOUND DRIVER
+P:      Kyle McMartin
+M:      kyle@parisc-linux.org
+P:      Thibaut Varene
+M:      T-Bone@parisc-linux.org
+W:      http://wiki.parisc-linux.org/AD1889
+L:      parisc-linux@lists.parisc-linux.org
+S:      Maintained
+
 ADM1025 HARDWARE MONITOR DRIVER
 P:      Jean Delvare
 M:      khali@linux-fr.org
@@ -1640,7 +1643,7 @@ S:	Maintained
 MIPS
 P:      Ralf Baechle
 M:      ralf@linux-mips.org
-W:      http://oss.sgi.com/mips/mips-howto.html
+W:      http://www.linux-mips.org/
 L:      linux-mips@linux-mips.org
 S:      Maintained
 
@@ -1942,6 +1945,14 @@ M:	george@mvista.com
 L:      netdev@vger.kernel.org
 S:      Supported
 
+POWERPC 4xx EMAC DRIVER
+P:      Eugene Surovegin
+M:      ebs@ebshome.net
+W:      http://kernel.ebshome.net/emac/
+L:      linuxppc-embedded@ozlabs.org
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 PNP SUPPORT
 P:      Adam Belay
 M:      ambx1@neo.rr.com
@@ -2275,6 +2286,11 @@ W:	http://tpmdd.sourceforge.net
 L:      tpmdd-devel@lists.sourceforge.net
 S:      Maintained
 
+Telecom Clock Driver for MCPL0010
+P: Mark Gross
+M: mark.gross@intel.com
+S: Supported
+
 TENSILICA XTENSA PORT (xtensa):
 P:      Chris Zankel
 M:      chris@zankel.net
@@ -2486,14 +2502,6 @@ L:	linux-kernel@vger.kernel.org
 L:      linux-usb-devel@lists.sourceforge.net
 S:      Supported
 
-USB BLUETOOTH TTY CONVERTER DRIVER
-P:      Greg Kroah-Hartman
-M:      greg@kroah.com
-L:      linux-usb-users@lists.sourceforge.net
-L:      linux-usb-devel@lists.sourceforge.net
-S:      Maintained
-W:      http://www.kroah.com/linux-usb/
-
 USB CDC ETHERNET DRIVER
 P:      Greg Kroah-Hartman
 M:      greg@kroah.com
@@ -2727,6 +2735,12 @@ P:	Roger Luethi
 M:      rl@hellgate.ch
 S:      Maintained
 
+VIAPRO SMBUS DRIVER
+P:      Jean Delvare
+M:      khali@linux-fr.org
+L:      lm-sensors@lm-sensors.org
+S:      Maintained
+
 UCLINUX (AND M68KNOMMU)
 P:      Greg Ungerer
 M:      gerg@uclinux.org
@@ -2848,6 +2862,12 @@ M:	jpr@f6fbb.org
 L:      linux-hams@vger.kernel.org
 S:      Maintained
 
+YEALINK PHONE DRIVER
+P:      Henk Vergonet
+M:      Henk.Vergonet@gmail.com
+L:      usbb2k-api-dev@nongnu.org
+S:      Maintained
+
 YMFPCI YAMAHA PCI SOUND (Use ALSA instead)
 P:      Pete Zaitcev
 M:      zaitcev@yahoo.com