1. 07 Jan, 2009 6 commits
    • Linus Torvalds's avatar
      Merge branch 'core-fixes-for-linus' of... · f94181da
      Linus Torvalds authored
      Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        rcu: fix rcutorture bug
        rcu: eliminate synchronize_rcu_xxx macro
        rcu: make treercu safe for suspend and resume
        rcu: fix rcutree grace-period-latency bug on small systems
        futex: catch certain assymetric (get|put)_futex_key calls
        futex: make futex_(get|put)_key() calls symmetric
        locking, percpu counters: introduce separate lock classes
        swiotlb: clean up EXPORT_SYMBOL usage
        swiotlb: remove unnecessary declaration
        swiotlb: replace architecture-specific swiotlb.h with linux/swiotlb.h
        swiotlb: add support for systems with highmem
        swiotlb: store phys address in io_tlb_orig_addr array
        swiotlb: add hwdev to swiotlb_phys_to_bus() / swiotlb_sg_to_bus()
      f94181da
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 932adbed
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ASoC: Fix SND_SOC_ALL_CODECS handling of dual SPI and I2C control buses
        ASoC: Use snd_soc_dapm_nc_pin() in at91sam9g20ek
        ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type
        ASoC: New enum type: value_enum
        pxa2xx-ac97: switch AC unit to correct state before probing
        ASoC: Clocking fixes for davinci-evm.c
        ASoC: Mark non-connected TWL4030 pins for pandora
        ASoC: OMAP: Select OMAP pin multiplexing when using Nokia N810 ASoC drivers
      932adbed
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · ce519e23
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (237 commits)
        Staging: android: binder: fix build errors
        Staging: android: add lowmemorykiller driver
        Staging: android: remove dummy android.c driver
        Staging: android: timed_gpio: Rename android_timed_gpio to timed_gpio
        Staging: android: add timed_gpio driver
        Staging: android: add ram_console driver
        Staging: android: add logging driver
        staging: android: binder: Fix use of euid
        Staging: android: binder: Fix gcc warnings about improper format specifiers for size_t in printk
        Staging: android: add binder driver
        Staging: add android framework
        Staging: epl: fix netdev->priv b0rkage
        Staging: epl: hr timers all run in hard irq context now
        Staging: epl: run Lindent on *.c files
        Staging: epl: run Lindent on *.h files
        Staging: epl: run Lindent on all user/*.h files
        Staging: epl: run Lindent on all kernel/*.h files
        Staging: add epl stack
        Staging: frontier: fix compiler warnings
        Staging: frontier: remove unused alphatrack_sysfs.c file
        ...
      ce519e23
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 · 40d7ee5d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (60 commits)
        uio: make uio_info's name and version const
        UIO: Documentation for UIO ioport info handling
        UIO: Pass information about ioports to userspace (V2)
        UIO: uio_pdrv_genirq: allow custom irq_flags
        UIO: use pci_ioremap_bar() in drivers/uio
        arm: struct device - replace bus_id with dev_name(), dev_set_name()
        libata: struct device - replace bus_id with dev_name(), dev_set_name()
        avr: struct device - replace bus_id with dev_name(), dev_set_name()
        block: struct device - replace bus_id with dev_name(), dev_set_name()
        chris: struct device - replace bus_id with dev_name(), dev_set_name()
        dmi: struct device - replace bus_id with dev_name(), dev_set_name()
        gadget: struct device - replace bus_id with dev_name(), dev_set_name()
        gpio: struct device - replace bus_id with dev_name(), dev_set_name()
        gpu: struct device - replace bus_id with dev_name(), dev_set_name()
        hwmon: struct device - replace bus_id with dev_name(), dev_set_name()
        i2o: struct device - replace bus_id with dev_name(), dev_set_name()
        IA64: struct device - replace bus_id with dev_name(), dev_set_name()
        i7300_idle: struct device - replace bus_id with dev_name(), dev_set_name()
        infiniband: struct device - replace bus_id with dev_name(), dev_set_name()
        ISDN: struct device - replace bus_id with dev_name(), dev_set_name()
        ...
      40d7ee5d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 5fec8bdb
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: clean up annotations of fc->lock
        fuse: fix sparse warning in ioctl
        fuse: update interface version
        fuse: add fuse_conn->release()
        fuse: separate out fuse_conn_init() from new_conn()
        fuse: add fuse_ prefix to several functions
        fuse: implement poll support
        fuse: implement unsolicited notification
        fuse: add file kernel handle
        fuse: implement ioctl support
        fuse: don't let fuse_req->end() put the base reference
        fuse: move FUSE_MINOR to miscdevice.h
        fuse: style fixes
      5fec8bdb
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 59e3af21
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (41 commits)
        scc_pata: make use of scc_dma_sff_read_status()
        ide-dma-sff: factor out ide_dma_sff_write_status()
        ide: move read_sff_dma_status() method to 'struct ide_dma_ops'
        ide: don't set hwif->dma_ops in init_dma() method
        Resurrect IT8172 IDE controller driver
        piix: sync ich_laptop[] with ata_piix.c
        ide: update warm-plug HOWTO
        ide: fix ide_port_scan() to do ACPI setup after initializing request queues
        ide: remove now redundant ->cur_dev checks
        ide: remove unused ide_hwif_t.sg_mapped field
        ide: struct ide_atapi_pc - remove unused fields and update documentation
        ide: remove superfluous hwif variable assignment from ide_timer_expiry()
        ide: use ide_pci_is_in_compatibility_mode() helper in setup-pci.c
        ide: make "paranoia" ->handler check in ide_intr() more strict
        ide-cd: convert to ide-atapi facilities
        ide-cd: start DMA before sending the actual packet command
        ide-cd: wait for DRQ to get set per default
        ide: Fix drive's DWORD-IO handling
        ide: add port and host iterators
        ide: dynamic allocation of device structures
        ...
      59e3af21
  2. 06 Jan, 2009 34 commits