On Fri, 2005-08-05 at 11:09 -0600, Bjorn Helgaas wrote: > On Friday 05 August 2005 10:49 am, Kristen Accardi wrote: > > Changing of the guards. > > > > Signed-off-by: Kristen Carlson Accardi <[EMAIL PROTECTED]> > > > > diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff > > linux-2.6.13-rc5/drivers/pci/hotplug/pciehp_core.c > > linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp_core.c > > --- linux-2.6.13-rc5/drivers/pci/hotplug/pciehp_core.c 2005-08-01 > > 21:45:48.000000000 -0700 > > +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp_core.c 2005-08-05 > > 09:34:57.000000000 -0700 > > @@ -23,7 +23,7 @@ > > * along with this program; if not, write to the Free Software > > * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. > > * > > - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> > > + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> > > * > > */ > > ... > > How about an update to MAINTAINERS in addition or even instead?
Ok. How bout in addition. Signed-off-by: Kristen Carlson Accardi <[EMAIL PROTECTED]> diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/pciehp_core.c linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp_core.c --- linux-2.6.13-rc5/drivers/pci/hotplug/pciehp_core.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp_core.c 2005-08-05 09:34:57.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/pciehp_ctrl.c linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp_ctrl.c --- linux-2.6.13-rc5/drivers/pci/hotplug/pciehp_ctrl.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp_ctrl.c 2005-08-05 09:35:31.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/pciehp.h linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp.h --- linux-2.6.13-rc5/drivers/pci/hotplug/pciehp.h 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp.h 2005-08-05 09:35:48.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ #ifndef _PCIEHP_H diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/pciehp_hpc.c linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp_hpc.c --- linux-2.6.13-rc5/drivers/pci/hotplug/pciehp_hpc.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp_hpc.c 2005-08-05 09:36:07.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>,<[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>,<[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/pciehp_pci.c linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp_pci.c --- linux-2.6.13-rc5/drivers/pci/hotplug/pciehp_pci.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehp_pci.c 2005-08-05 09:36:24.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/pciehprm_acpi.c linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehprm_acpi.c --- linux-2.6.13-rc5/drivers/pci/hotplug/pciehprm_acpi.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehprm_acpi.c 2005-08-05 09:36:48.000000000 -0700 @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/pciehprm.h linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehprm.h --- linux-2.6.13-rc5/drivers/pci/hotplug/pciehprm.h 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehprm.h 2005-08-05 09:37:07.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/pciehprm_nonacpi.c linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehprm_nonacpi.c --- linux-2.6.13-rc5/drivers/pci/hotplug/pciehprm_nonacpi.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehprm_nonacpi.c 2005-08-05 09:37:27.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/pciehprm_nonacpi.h linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehprm_nonacpi.h --- linux-2.6.13-rc5/drivers/pci/hotplug/pciehprm_nonacpi.h 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/pciehprm_nonacpi.h 2005-08-05 09:39:59.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchp_core.c linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchp_core.c --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchp_core.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchp_core.c 2005-08-05 09:37:47.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchp_ctrl.c linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchp_ctrl.c --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchp_ctrl.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchp_ctrl.c 2005-08-05 09:38:02.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchp.h linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchp.h --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchp.h 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchp.h 2005-08-05 09:38:12.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>,<[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>,<[EMAIL PROTECTED]> * */ #ifndef _SHPCHP_H diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchp_hpc.c linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchp_hpc.c --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchp_hpc.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchp_hpc.c 2005-08-05 09:38:21.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>,<[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>,<[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchp_pci.c linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchp_pci.c --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchp_pci.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchp_pci.c 2005-08-05 09:38:30.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm_acpi.c linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm_acpi.c --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm_acpi.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm_acpi.c 2005-08-05 09:38:39.000000000 -0700 @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm.h linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm.h --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm.h 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm.h 2005-08-05 09:38:47.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm_legacy.c linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm_legacy.c --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm_legacy.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm_legacy.c 2005-08-05 09:38:55.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>,<[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>,<[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm_legacy.h linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm_legacy.h --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm_legacy.h 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm_legacy.h 2005-08-05 09:39:04.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm_nonacpi.c linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm_nonacpi.c --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm_nonacpi.c 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm_nonacpi.c 2005-08-05 09:39:12.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm_nonacpi.h linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm_nonacpi.h --- linux-2.6.13-rc5/drivers/pci/hotplug/shpchprm_nonacpi.h 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/drivers/pci/hotplug/shpchprm_nonacpi.h 2005-08-05 09:39:23.000000000 -0700 @@ -23,7 +23,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> + * Send feedback to <[EMAIL PROTECTED]>, <[EMAIL PROTECTED]> * */ diff -uprN -X linux-2.6.13-rc5/Documentation/dontdiff linux-2.6.13-rc5/MAINTAINERS linux-2.6.13-rc5-new/MAINTAINERS --- linux-2.6.13-rc5/MAINTAINERS 2005-08-01 21:45:48.000000000 -0700 +++ linux-2.6.13-rc5-new/MAINTAINERS 2005-08-05 11:03:36.000000000 -0700 @@ -1825,6 +1825,11 @@ P: Greg Kroah-Hartman M: [EMAIL PROTECTED] S: Maintained +PCIE HOTPLUG DRIVER +P: Kristen Carlson Accardi +M: [EMAIL PROTECTED] +S: Maintained + PCMCIA SUBSYSTEM P: Linux PCMCIA Team L: http://lists.infradead.org/mailman/listinfo/linux-pcmcia @@ -2201,6 +2206,11 @@ W: http://projects.buici.com/arm L: [EMAIL PROTECTED] (subscribers-only) S: Maintained +SHPC HOTPLUG DRIVER +P: Kristen Carlson Accardi +M: [EMAIL PROTECTED] +S: Maintained + SPARC (sparc32): P: William L. Irwin M: [EMAIL PROTECTED] - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/