1. 08 Feb, 2007 3 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · c96e2c92
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (70 commits)
        USB: remove duplicate device id from zc0301
        USB: remove duplicate device id from usb_storage
        USB: remove duplicate device id from keyspan
        USB: remove duplicate device id from ftdi_sio
        USB: remove duplicate device id from visor
        USB: a bit more coding style cleanup
        usbcore: trivial whitespace fixes
        usb-storage: use first bulk endpoints, not last
        EHCI: fix interrupt-driven remote wakeup
        USB: switch ehci-hcd to new polling scheme
        USB: autosuspend for usb printer driver
        USB Input: Added kernel module to support all GTCO CalComp USB InterWrite School products
        USB: Sierra Wireless auto set D0
        USB: usb ethernet gadget recognizes HUSB2DEV
        USB: list atmel husb2_udc gadget controller
        USB: gadgetfs AIO tweaks
        USB: gadgetfs behaves better on userspace init bug
        USB: gadgetfs race fix
        USB: gadgetfs simplifications
        USB: gadgetfs cleanups
        ...
      c96e2c92
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · f2aca47d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6: (28 commits)
        sysfs: Shadow directory support
        Driver Core: Increase the default timeout value of the firmware subsystem
        Driver core: allow to delay the uevent at device creation time
        Driver core: add device_type to struct device
        Driver core: add uevent vars for devices of a class
        SYSFS: Fix missing include of list.h in sysfs.h
        HOWTO: Add a reference to Harbison and Steele
        sysfs: error handling in sysfs, fill_read_buffer()
        kobject: kobject_put cleanup
        sysfs: kobject_put cleanup
        sysfs: suppress lockdep warnings
        Driver core: fix race in sysfs between sysfs_remove_file() and read()/write()
        driver core: Change function call order in device_bind_driver().
        driver core: Don't stop probing on ->probe errors.
        driver core fixes: device_register() retval check in platform.c
        driver core fixes: make_class_name() retval checks
        /sys/modules/*/holders
        USB: add the sysfs driver name to all modules
        SERIO: add the sysfs driver name to all modules
        PCI: add the sysfs driver name to all modules
        ...
      f2aca47d
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 7677ced4
      Linus Torvalds authored
      * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (116 commits)
        sk98lin: planned removal
        AT91: MACB support
        sky2: version 1.12
        sky2: add new chip ids
        sky2: Yukon Extreme support
        sky2: safer transmit timeout
        sky2: TSO support for EC_U
        sky2: use dev_err for error reports
        sky2: add Wake On Lan support
        fix unaligned exception in /drivers/net/wireless/orinoco.c
        Remove unused kernel config option DLCI_COUNT
        z85230: spinlock logic
        mips: declance: Driver model for the PMAD-A
        Spidernet: Rework RX linked list
        NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
        NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
        hp100: convert pci_module_init() to pci_register_driver()
        NetXen: Added ethtool support for user level tools.
        NetXen: Firmware crb init changes.
        maintainers: add atl1 maintainers
        ...
      7677ced4
  2. 07 Feb, 2007 37 commits