Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24:
  sh: include ax88796 in the defconfig for r7785rp
  sh: include ax88796 in the defconfig for r7780mp
  sh: fix R2D-1 CF support
  fb: Orphan imsttfb.
  sh: Update mailing list info.
  sh: lockless UTLB miss fast-path.
  sh: Kill off UTLB flush in fast-path.
  sh: Fix copy_{to,from}_user_page() with cache disabled.

1 files changed, 4 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a8df8e40e39..b21a911193e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1914,10 +1914,8 @@ L:	linux1394-devel@lists.sourceforge.net
 S:      Maintained
 
 IMS TWINTURBO FRAMEBUFFER DRIVER
-P:      Paul Mundt
-M:      lethal@chaoticdreams.org
 L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
-S:      Maintained
+S:      Orphan
 
 INFINIBAND SUBSYSTEM
 P:      Roland Dreier
@@ -3636,18 +3634,12 @@ M:	laredo@gnu.org
 W:      http://www.stradis.com/
 S:      Maintained
 
-SUPERH (sh)
-P:      Paul Mundt
-M:      lethal@linux-sh.org
-L:      linuxsh-dev@lists.sourceforge.net (subscribers-only)
-W:      http://www.linux-sh.org
-S:      Maintained
-
-SUPERH64 (sh64)
+SUPERH
 P:      Paul Mundt
 M:      lethal@linux-sh.org
-L:      linuxsh-shmedia-dev@lists.sourceforge.net
+L:      linux-sh@vger.kernel.org
 W:      http://www.linux-sh.org
+T:      git kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6.git
 S:      Maintained
 
 SUN3/3X