1. 19 Feb, 2007 5 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · dd397a6d
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (30 commits)
        ide: make ide_hwif_t.ide_dma_host_on void (v2)
        ide: make ide_hwif_t.ide_dma_{host_off,off_quietly} void (v2)
        ide: add ide_set_dma() helper (v2)
        sgiioc4: fix sgiioc4_ide_dma_check() to enable/disable DMA properly
        ide: disable DMA in ->ide_dma_check for "no IORDY" case (v2)
        ide: convert ide_hwif_t.mmio into flag (v2)
        ide: use PIO/MMIO operations directly where possible (v2)
        ide: add ide_use_fast_pio() helper (v3)
        ide: unexport ide_set_xfer_rate() (v2)
        ide: remove ide_drive_t.usage
        ide: remove ide_pci_device_t tables with only one entry
        ide: remove write-only ide_hwif_t.no_dsc flag
        ide: remove write-only ide_pio_data_t.blacklisted
        sis5513: sis5513_config_xfer_rate() cleanup
        piix: cleanup
        svwks: small cleanup
        cs5530: small cleanup
        hpt366: remove redundant check from init_dma_hpt366()
        trm290: remove redundant CONFIG_BLK_DEV_IDEDMA #ifdef-s
        au1xxx-ide: remove dead code
        ...
      dd397a6d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband · 976fd0e2
      Linus Torvalds authored
      * 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
        IB/core: Set static rate in ib_init_ah_from_path()
        IB/ipath: Make ipath_map_sg() static
        IB/core: Fix sparse warnings about shadowed declarations
        RDMA/cma: Add multicast communication support
        IB/sa: Track multicast join/leave requests
        IPoIB: CM error handling thinko fix
        RDMA/cxgb3: Remove Open Grid Computing copyrights in iw_cxgb3 driver
        RDMA/cxgb3: Fail posts synchronously when in TERMINATE state
        RDMA/iwcm: iw_cm_id destruction race fixes
        IB/ehca: Change query_port() to return LINK_UP instead UNKNOWN
        IB/ehca: Allow en/disabling scaling code via module parameter
        IB/ehca: Fix race condition/locking issues in scaling code
        IB/ehca: Rework irq handler
        IPoIB: Only allow root to change between datagram and connected mode
        IB/mthca: Fix allocation of ICM chunks in coherent memory
        IB/mthca: Allow the QP state transition RESET->RESET
      976fd0e2
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 · 733abe4f
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
        PCI: Make PCI device numa-node attribute visible in sysfs
        PCI: add systems for automatic breadth-first device sorting
        PCI: PCI devices get assigned redundant IRQs
        PCI: Make CARDBUS_MEM_SIZE and CARDBUS_IO_SIZE boot options
        PCI: pci.txt fix __devexit() usage
        PCI/sysfs/kobject kernel-doc fixes
      733abe4f
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 · 5fe8252f
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
        sysfs: fix build errors: uevent with CONFIG_SYSFS=n
        pcmcia: some class_device fallout
        Driver core: device_add_attrs() cleanup
        debugfs: Remove misleading comments.
        debugfs: implement symbolic links
        Driver: remove redundant kobject_unregister checks
        kobject: kobj->k_name verification fix
        serial: Add PCMCIA IDs for Quatech DSP-100 dual RS232 adapter.
        Driver core: let request_module() send a /sys/modules/kmod/-uevent
        Driver.h copyright update
      5fe8252f
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6 · 460223d2
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (39 commits)
        USB: at91-ohci, handle extra at91sam9261 ahb clock
        USB: another id for cp2101 driver
        USB: ueagle-atm.c needs sched.h
        USB: at91_udc, shrink runtime footprint
        usbnet: add missing Kconfig for KC2190 cables
        usbnet: init fault (oops) cleanup, whitespace fixes
        usbnet: recognize SiteCom CN-124
        usb: Remove Airprime device from option.c
        USB: change __init to __devinit for isp116x_probe
        USB: ps3: don't call ps3_system_bus_driver_register on other platforms
        USB: hid-core.c: Removes GTCO CalComp Interwrite IPanel PIDs from blacklist
        USB: kernel-doc fixes
        USB: quirky device for cdc-acm
        USB: cdc-acm: fix incorrect throtteling, make set_control optional
        USB: unconfigure devices which have config 0
        USB: make usb_iso_packet_descriptor.status signed
        USB: fix g_serial small error
        USB: use __u32 rather than u32 in userspace ioctls in usbdevice_fs.h
        USB Storage: US_FL_IGNORE_RESIDUE needed for Aiptek MP3 Player
        USB: Fix misspelled "USBNET_MII" kernel config option.
        ...
      460223d2
  2. 17 Feb, 2007 35 commits