1. 17 Sep, 2009 34 commits
  2. 16 Sep, 2009 6 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 · ab86e576
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
        Driver Core: devtmpfs - kernel-maintained tmpfs-based /dev
        debugfs: Modify default debugfs directory for debugging pktcdvd.
        debugfs: Modified default dir of debugfs for debugging UHCI.
        debugfs: Change debugfs directory of IWMC3200
        debugfs: Change debuhgfs directory of trace-events-sample.h
        debugfs: Fix mount directory of debugfs by default in events.txt
        hpilo: add poll f_op
        hpilo: add interrupt handler
        hpilo: staging for interrupt handling
        driver core: platform_device_add_data(): use kmemdup()
        Driver core: Add support for compatibility classes
        uio: add generic driver for PCI 2.3 devices
        driver-core: move dma-coherent.c from kernel to driver/base
        mem_class: fix bug
        mem_class: use minor as index instead of searching the array
        driver model: constify attribute groups
        UIO: remove 'default n' from Kconfig
        Driver core: Add accessor for device platform data
        Driver core: move dev_get/set_drvdata to drivers/base/dd.c
        Driver core: add new device to bus's list before probing
      ab86e576
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 7ea61767
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (641 commits)
        Staging: remove sxg driver
        Staging: remove heci driver
        Staging: remove at76_usb wireless driver.
        Staging: rspiusb: remove the driver
        Staging: meilhaus: remove the drivers
        Staging: remove me4000 driver.
        Staging: line6: ffzb returns an unsigned integer
        Staging: line6: pod.c: style cleanups
        Staging: iio: introduce missing kfree
        Staging: dream: introduce missing kfree
        Staging: comedi: addi-data: NULL dereference of amcc in v_pci_card_list_init()
        Staging: vt665x: fix built-in compiling
        Staging: rt3090: enable NATIVE_WPA_SUPPLICANT_SUPPORT option
        Staging: rt3090: port changes in WPA_MIX_PAIR_CIPHER to rt3090
        Staging: rt3090: rename device from raX to wlanX
        Staging: rt3090: remove possible conflict with rt2860
        Staging: rt2860/rt2870/rt3070/rt3090: fix compiler warning on x86_64
        Staging: rt2860: add new device ids
        Staging: rt3090: add device id 1462:891a
        Staging: asus_oled: Cleaned up checkpatch issues.
        ...
      7ea61767
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6 · 0950efd1
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pcmcia-2.6:
        pcmcia: document return value of pcmcia_loop_config
        pcmcia: dtl1_cs: fix pcmcia_loop_config logic
        pcmcia: drop non-existant includes
        pcmcia: disable prefetch/burst for OZ6933
        pcmcia: fix incorrect argument order to list_add_tail()
        pcmcia: drivers/pcmcia/pcmcia_resource.c: Remove unnecessary semicolons
        pcmcia: Use phys_addr_t for physical addresses
        pcmcia: drivers/pcmcia: Make static
      0950efd1
    • Linus Torvalds's avatar
      Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 · 4406c56d
      Linus Torvalds authored
      * 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (75 commits)
        PCI hotplug: clean up acpi_run_hpp()
        PCI hotplug: acpiphp: use generic pci_configure_slot()
        PCI hotplug: shpchp: use generic pci_configure_slot()
        PCI hotplug: pciehp: use generic pci_configure_slot()
        PCI hotplug: add pci_configure_slot()
        PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface
        PCI hotplug: acpiphp: don't cache hotplug_params in acpiphp_bridge
        PCI hotplug: acpiphp: remove superfluous _HPP/_HPX evaluation
        PCI: Clear saved_state after the state has been restored
        PCI PM: Return error codes from pci_pm_resume()
        PCI: use dev_printk in quirk messages
        PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset()
        PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle
        PCI Hotplug: acpiphp: find bridges the easy way
        PCI: pcie portdrv: remove unused variable
        PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI support
        ACPI PM: Replace wakeup.prepared with reference counter
        PCI PM: Introduce device flag wakeup_prepared
        PCI / ACPI PM: Rework some debug messages
        PCI PM: Simplify PCI wake-up code
        ...
      
      Fixed up conflict in arch/powerpc/kernel/pci_64.c due to OF device tree
      scanning having been moved and merged for the 32- and 64-bit cases.  The
      'needs_freset' initialization added in 6e19314c ("PCI/powerpc: support
      PCIe fundamental reset") is now in arch/powerpc/kernel/pci_of_scan.c.
      4406c56d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block · 6b7b352f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
        block: fix linkage problem with blk_iopoll and !CONFIG_BLOCK
      6b7b352f
    • Linus Torvalds's avatar
      Merge branch 'writeback' of git://git.kernel.dk/linux-2.6-block · a3eb51ec
      Linus Torvalds authored
      * 'writeback' of git://git.kernel.dk/linux-2.6-block:
        writeback: fix possible bdi writeback refcounting problem
        writeback: Fix bdi use after free in wb_work_complete()
        writeback: improve scalability of bdi writeback work queues
        writeback: remove smp_mb(), it's not needed with list_add_tail_rcu()
        writeback: use schedule_timeout_interruptible()
        writeback: add comments to bdi_work structure
        writeback: splice dirty inode entries to default bdi on bdi_destroy()
        writeback: separate starting of sync vs opportunistic writeback
        writeback: inline allocation failure handling in bdi_alloc_queue_work()
        writeback: use RCU to protect bdi_list
        writeback: only use bdi_writeback_all() for WB_SYNC_NONE writeout
        fs: Assign bdi in super_block
        writeback: make wb_writeback() take an argument structure
        writeback: merely wakeup flusher thread if work allocation fails for WB_SYNC_NONE
        writeback: get rid of wbc->for_writepages
        fs: remove bdev->bd_inode_backing_dev_info
      a3eb51ec