1. 29 10月, 2011 8 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 68d99b2c
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (549 commits)
        ALSA: hda - Fix ADC input-amp handling for Cx20549 codec
        ALSA: hda - Keep EAPD turned on for old Conexant chips
        ALSA: hda/realtek - Fix missing volume controls with ALC260
        ASoC: wm8940: Properly set codec->dapm.bias_level
        ALSA: hda - Fix pin-config for ASUS W90V
        ALSA: hda - Fix surround/CLFE headphone and speaker pins order
        ALSA: hda - Fix typo
        ALSA: Update the sound git tree URL
        ALSA: HDA: Add new revision for ALC662
        ASoC: max98095: Convert codec->hw_write to snd_soc_write
        ASoC: keep pointer to resource so it can be freed
        ASoC: sgtl5000: Fix wrong mask in some snd_soc_update_bits calls
        ASoC: wm8996: Fix wrong mask for setting WM8996_AIF_CLOCKING_2
        ASoC: da7210: Add support for line out and DAC
        ASoC: da7210: Add support for DAPM
        ALSA: hda/realtek - Fix DAC assignments of multiple speakers
        ASoC: Use SGTL5000_LINREG_VDDD_MASK instead of hardcoded mask value
        ASoC: Set sgtl5000->ldo in ldo_regulator_register
        ASoC: wm8996: Use SND_SOC_DAPM_AIF_OUT for AIF2 Capture
        ASoC: wm8994: Use SND_SOC_DAPM_AIF_OUT for AIF3 Capture
        ...
      68d99b2c
    • L
      Merge branch 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci · 0e59e7e7
      Linus Torvalds 提交于
      * 'next-rebase' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
        PCI: Clean-up MPS debug output
        pci: Clamp pcie_set_readrq() when using "performance" settings
        PCI: enable MPS "performance" setting to properly handle bridge MPS
        PCI: Workaround for Intel MPS errata
        PCI: Add support for PASID capability
        PCI: Add implementation for PRI capability
        PCI: Export ATS functions to modules
        PCI: Move ATS implementation into own file
        PCI / PM: Remove unnecessary error variable from acpi_dev_run_wake()
        PCI hotplug: acpiphp: Prevent deadlock on PCI-to-PCI bridge remove
        PCI / PM: Extend PME polling to all PCI devices
        PCI quirk: mmc: Always check for lower base frequency quirk for Ricoh 1180:e823
        PCI: Make pci_setup_bridge() non-static for use by arch code
        x86: constify PCI raw ops structures
        PCI: Add quirk for known incorrect MPSS
        PCI: Add Solarflare vendor ID and SFC4000 device IDs
      0e59e7e7
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc · 46b51ea2
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (83 commits)
        mmc: fix compile error when CONFIG_BLOCK is not enabled
        mmc: core: Cleanup eMMC4.5 conditionals
        mmc: omap_hsmmc: if multiblock reads are broken, disable them
        mmc: core: add workaround for controllers with broken multiblock reads
        mmc: core: Prevent too long response times for suspend
        mmc: recognise SDIO cards with SDIO_CCCR_REV 3.00
        mmc: sd: Handle SD3.0 cards not supporting UHS-I bus speed mode
        mmc: core: support HPI send command
        mmc: core: Add cache control for eMMC4.5 device
        mmc: core: Modify the timeout value for writing power class
        mmc: core: new discard feature support at eMMC v4.5
        mmc: core: mmc sanitize feature support for v4.5
        mmc: dw_mmc: modify DATA register offset
        mmc: sdhci-pci: add flag for devices that can support runtime PM
        mmc: omap_hsmmc: ensure pbias configuration is always done
        mmc: core: Add Power Off Notify Feature eMMC 4.5
        mmc: sdhci-s3c: fix potential NULL dereference
        mmc: replace printk with appropriate display macro
        mmc: core: Add default timeout value for CMD6
        mmc: sdhci-pci: add runtime pm support
        ...
      46b51ea2
    • L
      Merge branch 'devel-stable' of... · 1fdb24e9
      Linus Torvalds 提交于
      Merge branch 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
      
      * 'devel-stable' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (178 commits)
        ARM: 7139/1: fix compilation with CONFIG_ARM_ATAG_DTB_COMPAT and large TEXT_OFFSET
        ARM: gic, local timers: use the request_percpu_irq() interface
        ARM: gic: consolidate PPI handling
        ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H
        ARM: mach-s5p64x0: remove mach/memory.h
        ARM: mach-s3c64xx: remove mach/memory.h
        ARM: plat-mxc: remove mach/memory.h
        ARM: mach-prima2: remove mach/memory.h
        ARM: mach-zynq: remove mach/memory.h
        ARM: mach-bcmring: remove mach/memory.h
        ARM: mach-davinci: remove mach/memory.h
        ARM: mach-pxa: remove mach/memory.h
        ARM: mach-ixp4xx: remove mach/memory.h
        ARM: mach-h720x: remove mach/memory.h
        ARM: mach-vt8500: remove mach/memory.h
        ARM: mach-s5pc100: remove mach/memory.h
        ARM: mach-tegra: remove mach/memory.h
        ARM: plat-tcc: remove mach/memory.h
        ARM: mach-mmp: remove mach/memory.h
        ARM: mach-cns3xxx: remove mach/memory.h
        ...
      
      Fix up mostly pretty trivial conflicts in:
       - arch/arm/Kconfig
       - arch/arm/include/asm/localtimer.h
       - arch/arm/kernel/Makefile
       - arch/arm/mach-shmobile/board-ap4evb.c
       - arch/arm/mach-u300/core.c
       - arch/arm/mm/dma-mapping.c
       - arch/arm/mm/proc-v7.S
       - arch/arm/plat-omap/Kconfig
      largely due to some CONFIG option renaming (ie CONFIG_PM_SLEEP ->
      CONFIG_ARM_CPU_SUSPEND for the arm-specific suspend code etc) and
      addition of NEED_MACH_MEMORY_H next to HAVE_IDE.
      1fdb24e9
    • L
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue · f362f98e
      Linus Torvalds 提交于
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/vfs-queue: (21 commits)
        leases: fix write-open/read-lease race
        nfs: drop unnecessary locking in llseek
        ext4: replace cut'n'pasted llseek code with generic_file_llseek_size
        vfs: add generic_file_llseek_size
        vfs: do (nearly) lockless generic_file_llseek
        direct-io: merge direct_io_walker into __blockdev_direct_IO
        direct-io: inline the complete submission path
        direct-io: separate map_bh from dio
        direct-io: use a slab cache for struct dio
        direct-io: rearrange fields in dio/dio_submit to avoid holes
        direct-io: fix a wrong comment
        direct-io: separate fields only used in the submission path from struct dio
        vfs: fix spinning prevention in prune_icache_sb
        vfs: add a comment to inode_permission()
        vfs: pass all mask flags check_acl and posix_acl_permission
        vfs: add hex format for MAY_* flag values
        vfs: indicate that the permission functions take all the MAY_* flags
        compat: sync compat_stats with statfs.
        vfs: add "device" tag to /proc/self/mountstats
        cleanup: vfs: small comment fix for block_invalidatepage
        ...
      
      Fix up trivial conflict in fs/gfs2/file.c (llseek changes)
      f362f98e
    • L
      Merge http://sucs.org/~rohan/git/gfs2-3.0-nmw · f793f296
      Linus Torvalds 提交于
      * http://sucs.org/~rohan/git/gfs2-3.0-nmw: (24 commits)
        GFS2: Move readahead of metadata during deallocation into its own function
        GFS2: Remove two unused variables
        GFS2: Misc fixes
        GFS2: rewrite fallocate code to write blocks directly
        GFS2: speed up delete/unlink performance for large files
        GFS2: Fix off-by-one in gfs2_blk2rgrpd
        GFS2: Clean up ->page_mkwrite
        GFS2: Correctly set goal block after allocation
        GFS2: Fix AIL flush issue during fsync
        GFS2: Use cached rgrp in gfs2_rlist_add()
        GFS2: Call do_strip() directly from recursive_scan()
        GFS2: Remove obsolete assert
        GFS2: Cache the most recently used resource group in the inode
        GFS2: Make resource groups "append only" during life of fs
        GFS2: Use rbtree for resource groups and clean up bitmap buffer ref count scheme
        GFS2: Fix lseek after SEEK_DATA, SEEK_HOLE have been added
        GFS2: Clean up gfs2_create
        GFS2: Use ->dirty_inode()
        GFS2: Fix bug trap and journaled data fsync
        GFS2: Fix inode allocation error path
        ...
      f793f296
    • L
      Merge branch '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6 · dabcbb1b
      Linus Torvalds 提交于
      * '3.2-without-smb2' of git://git.samba.org/sfrench/cifs-2.6: (52 commits)
        Fix build break when freezer not configured
        Add definition for share encryption
        CIFS: Make cifs_push_locks send as many locks at once as possible
        CIFS: Send as many mandatory unlock ranges at once as possible
        CIFS: Implement caching mechanism for posix brlocks
        CIFS: Implement caching mechanism for mandatory brlocks
        CIFS: Fix DFS handling in cifs_get_file_info
        CIFS: Fix error handling in cifs_readv_complete
        [CIFS] Fixup trivial checkpatch warning
        [CIFS] Show nostrictsync and noperm mount options in /proc/mounts
        cifs, freezer: add wait_event_freezekillable and have cifs use it
        cifs: allow cifs_max_pending to be readable under /sys/module/cifs/parameters
        cifs: tune bdi.ra_pages in accordance with the rsize
        cifs: allow for larger rsize= options and change defaults
        cifs: convert cifs_readpages to use async reads
        cifs: add cifs_async_readv
        cifs: fix protocol definition for READ_RSP
        cifs: add a callback function to receive the rest of the frame
        cifs: break out 3rd receive phase into separate function
        cifs: find mid earlier in receive codepath
        ...
      dabcbb1b
    • L
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 5619a693
      Linus Torvalds 提交于
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (69 commits)
        xfs: add AIL pushing tracepoints
        xfs: put in missed fix for merge problem
        xfs: do not flush data workqueues in xfs_flush_buftarg
        xfs: remove XFS_bflush
        xfs: remove xfs_buf_target_name
        xfs: use xfs_ioerror_alert in xfs_buf_iodone_callbacks
        xfs: clean up xfs_ioerror_alert
        xfs: clean up buffer allocation
        xfs: remove buffers from the delwri list in xfs_buf_stale
        xfs: remove XFS_BUF_STALE and XFS_BUF_SUPER_STALE
        xfs: remove XFS_BUF_SET_VTYPE and XFS_BUF_SET_VTYPE_REF
        xfs: remove XFS_BUF_FINISH_IOWAIT
        xfs: remove xfs_get_buftarg_list
        xfs: fix buffer flushing during unmount
        xfs: optimize fsync on directories
        xfs: reduce the number of log forces from tail pushing
        xfs: Don't allocate new buffers on every call to _xfs_buf_find
        xfs: simplify xfs_trans_ijoin* again
        xfs: unlock the inode before log force in xfs_change_file_space
        xfs: unlock the inode before log force in xfs_fs_nfs_commit_metadata
        ...
      5619a693
  2. 28 10月, 2011 32 次提交