Merge with /shiny/git/linux-2.6/.git
authorDavid Woodhouse <dwmw2@shinybook.infradead.org>
Tue, 19 Jul 2005 21:49:39 +0000 (17:49 -0400)
committerDavid Woodhouse <dwmw2@shinybook.infradead.org>
Tue, 19 Jul 2005 21:49:39 +0000 (17:49 -0400)
1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 6b2de371f0fbcf5390d287e1d0abc58344e5f012,48aa6d3d3ce961fe37a22940d73fff7e3b910cf5..aa257301d86b8bfef5fd2b48c8135addd647e817
@@@ -371,10 -371,7 +371,10 @@@ W:       http://atmelwlandriver.sourceforge.n
  S:    Maintained
  
  AUDIT SUBSYSTEM
 -L:    linux-audit@redhat.com (subscribers-only)
 +P:    David Woodhouse
 +M:    dwmw2@infradead.org
 +L:    linux-audit@redhat.com
 +W:    http://people.redhat.com/sgrubb/audit/
  S:    Maintained
  
  AX.25 NETWORK LAYER
@@@ -1172,6 -1169,12 +1172,12 @@@ L:    linux-input@atrey.karlin.mff.cuni.c
  L:    linux-joystick@atrey.karlin.mff.cuni.cz
  S:    Maintained
  
+ INOTIFY
+ P:    John McCutchan and Robert Love
+ M:    ttb@tentacle.dhs.org and rml@novell.com
+ L:    linux-kernel@vger.kernel.org
+ S:    Maintained
  INTEL 810/815 FRAMEBUFFER DRIVER
  P:      Antonino Daplas
  M:      adaplas@pol.net
@@@ -2423,6 -2426,12 +2429,12 @@@ L:    linux-usb-users@lists.sourceforge.ne
  L:    linux-usb-devel@lists.sourceforge.net
  S:    Maintained
  
+ USB OPTION-CARD DRIVER
+ P:    Matthias Urlichs
+ M:    smurf@smurf.noris.de
+ L:    linux-usb-devel@lists.sourceforge.net
+ S:    Maintained
  USB OV511 DRIVER
  P:    Mark McClelland
  M:    mmcclell@bigfoot.com