1. 31 Jul, 2007 32 commits
  2. 30 Jul, 2007 8 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · cbdd3deb
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
        Fix a potential NULL pointer dereference in mace_interrupt() in drivers/net/pcmcia/nmclan_cs.c
        PATCH kernel 2.6.22] PCMCIA-NETDEV : modify smc91c92_cs.c to become SMP safe
        S2io: Increment received packet count correctly
        S2io: Fix crash when resetting adapter
        S2io: Mask spurious interrupts
        S2IO: Implementing review comments from old patches
        S2IO: Checking for the return value of pci map function
        S2IO: Removing MSI support from driver
        S2IO: Removing 3 buffer mode support from the driver
        netxen: drop redudant spinlock
        netxen: Fix interrupt handling for multiport adapters
        netxen: re-init station address after h/w init
        tulip: Remove tulip maintainer
        forcedeth: mac address correct
        gfar: Fix modpost warning
        lib8390: comment on locking by Alan Cox
        Fix a potential NULL pointer dereference in write_bulk_callback() in drivers/net/usb/pegasus.c
      cbdd3deb
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 4dcf39c6
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/ipath: Workaround problem of errormask register being overwritten
        IB/ipath: Fix some issues with buffer cancel and sendctrl register update
        IB/ipath: Use faster put_tid_2 routine after initialization
        IB/ipath: Remove unsafe fastrcvint code from interrupt handler
        IB/ehca: Move extern declarations from .c files to .h files
        IB/mlx4: Whitespace fix
        IB/ehca: Fix include order to better match kernel style
        mlx4_core: Remove kfree() in mlx4_mr_alloc() error flow
        RDMA/amso1100: Initialize the wait_queue_head_t in the c2_qp structure
      4dcf39c6
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · af947311
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        modules: better error messages when modules fail to load due to a sysfs problem.
        kobject: update documentation
        kset: kernel-doc cleanups
        driver core: revert "device" link creation check
        stable_api_nonsense.txt: Disambiguate the use of "this" by using "that" to refer to the syscall interface
        Fix Doc/sysfs-rules typos
        kernel-doc fixes for PCI and drivers/base/
        kobject: put kobject_actions in kobject.h
        kobject: fix link error when CONFIG_HOTPLUG is disabled
        HOWTO: sync Japanese HOWTO
        HOWTO: adjust translation header of Japanese stable_api_nonsense.txt
      af947311
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 9f8e35fc
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
        USB: "sparse" cleanups for usb gadgets
        usb-serial: Fix edgeport regression on non-EPiC devices
        USB: more pxa2xx_udc dead code removal
        USB: NIKON D50 is an unusual device
        USB: drivers/usb/serial/sierra.c: make 3 functions static
        USB: fix BUG: sleeping function called from invalid context at /home/jeremy/hg/xen/paravirt/linux/drivers/usb/core/urb.c:524, in_atomic():1, irqs_disabled():0
        USB: mct_u232: Convert to proper speed handling API
        digi_acceleport: Drag the driver kicking and screaming into coding style
        cp2101: Remove broken termios optimisation, use proper speed API
        USB: Fix a bug in usb_start_wait_urb
        USB: fix scatterlist PIO case (IOMMU)
        USB: fix usb_serial_suspend(): buggy code
        USB: yet another quirky device
        USB: Add CanonScan LiDE30 to the quirk list
        USB: even more quirks
        USB: usb.h kernel-doc additions
        USB: more quirky devices
        USB: Don't let usb-storage steal Blackberry Pearl
        USB: devices misc: Trivial patch to build the IOWARRIOR when it is selected in Kconfig
      9f8e35fc
    • Greg Kroah-Hartman's avatar
      modules: better error messages when modules fail to load due to a sysfs problem. · 74c5b597
      Greg Kroah-Hartman authored
      This helps people when debugging problems like the ones that were in the
      recent -mm releases.
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      74c5b597
    • Cornelia Huck's avatar
      kobject: update documentation · f285ea05
      Cornelia Huck authored
      Update kobject documentation:
      
      - Update structure definitions.
      - Remove documentation of removed struct subsystem.
      
      (First shot, uevent_ops probably need some documentation as well.)
      Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      
      f285ea05
    • Randy Dunlap's avatar
      kset: kernel-doc cleanups · a5615648
      Randy Dunlap authored
      Removed kernel-doc marker (/**) from struct kset -- each struct member
      still needs annotation.
      
      Corrected one parameter name so that kernel-doc matches the macro.
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      a5615648
    • Cornelia Huck's avatar
      driver core: revert "device" link creation check · 27907689
      Cornelia Huck authored
      driver core: revert "device" link creation check
      
      Commit 2ee97caf introduced an extra
      check on when to create the "device" symlink. Unfortunately, this
      breaks input, so let's revert to the old behaviour.
      Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
      Acked-by: default avatarKay Sievers <kay.sievers@vrfy.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
      
      27907689