Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Nov 2007 03:39:55 +0000 (19:39 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 27 Nov 2007 03:39:55 +0000 (19:39 -0800)
* 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  2 
MAINTAINERS

diff --combined MAINTAINERS
index a8df8e40e39d9b5e5cbe9f7008a660d70436ad52,320e5a43eefd401ea99ba750b89d2c1a2dafede0..b21a911193e8e9737e097b54a8d8e6a90cc7a96f
@@@ -1914,10 -1914,8 +1914,8 @@@ L:     linux1394-devel@lists.sourceforge.ne
  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
@@@ -2446,7 -2444,7 +2444,7 @@@ M68K ON APPLE MACINTOS
  P:    Joshua Thompson
  M:    funaho@jurai.org
  W:    http://www.mac.linux-m68k.org/
 -L:    linux-mac68k@mac.linux-m68k.org
 +L:    linux-m68k@lists.linux-m68k.org
  S:    Maintained
  
  M68K ON HP9000/300
@@@ -3636,18 -3634,12 +3634,12 @@@ M:   laredo@gnu.or
  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