Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9359ede7 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream'

parents 35ebbae2 81cfb886

CREDITS

+6 −0
Original line number Diff line number Diff line
@@ -2247,6 +2247,12 @@ S: 249 Nichols Avenue 
S: Syracuse, New York 13206

S: USA



N: Kyle McMartin

E: kyle@parisc-linux.org

D: Linux/PARISC hacker

D: AD1889 sound driver

S: Ottawa, Canada



N: Dirk Melchers

E: dirk@merlin.nbg.sub.org

D: 8 bit XT hard disk driver for OMTI5520

Documentation/Changes

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ o isdn4k-utils 3.1pre1 # isdnctrl 2>&1|grep version 
o  nfs-utils              1.0.5                   # showmount --version

o  procps                 3.2.0                   # ps --version

o  oprofile               0.9                     # oprofiled --version

o  udev                   058                     # udevinfo -V

o  udev                   071                     # udevinfo -V



Kernel compilation

==================

Documentation/DocBook/kernel-api.tmpl

+3 −1
Original line number Diff line number Diff line
@@ -286,7 +286,9 @@ X!Edrivers/pci/search.c 
 -->

!Edrivers/pci/msi.c

!Edrivers/pci/bus.c

!Edrivers/pci/hotplug.c

<!-- FIXME: Removed for now since no structured comments in source

X!Edrivers/pci/hotplug.c

-->

!Edrivers/pci/probe.c

!Edrivers/pci/rom.c

     </sect1>

Documentation/DocBook/usb.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ 


!Edrivers/usb/core/hcd.c

!Edrivers/usb/core/hcd-pci.c

!Edrivers/usb/core/buffer.c

!Idrivers/usb/core/buffer.c

    </chapter>



    <chapter>

Documentation/DocBook/writing_usb_driver.tmpl

+1 −2
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ if (!retval) { 
  <programlisting>

static inline void skel_delete (struct usb_skel *dev)

{

    if (dev->bulk_in_buffer != NULL)

    kfree (dev->bulk_in_buffer);

    if (dev->bulk_out_buffer != NULL)

        usb_buffer_free (dev->udev, dev->bulk_out_size,