1. 19 Apr, 2009 6 commits
    • Takashi Iwai's avatar
      Merge branch 'fix/misc' into for-linus · d6aa764e
      Takashi Iwai authored
      * fix/misc:
        ALSA: MAINTAINERS - Update SOUND
        ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()
      d6aa764e
    • Takashi Iwai's avatar
      Merge branch 'fix/intel8x0' into for-linus · 81584a07
      Takashi Iwai authored
      * fix/intel8x0:
        ALSA: Intel8x0: Add hp_only quirk for SSID 0x1028016a (Dell Inspiron 8600)
        ALSA: Intel8x0: Remove conflicting quirk for SSID 0x103c0934
      81584a07
    • Takashi Iwai's avatar
      Merge branch 'fix/hda' into for-linus · 7c4112a2
      Takashi Iwai authored
      * fix/hda:
        ALSA: hda - Set function_id only on FG nodes
        ALSA: hda - Add upper-limit of mixer amp for AD1884A-laptop model, too
        ALSA: hda - Fix headphone-detection on some machines with STAC/IDT codecs
        ALSA: hda_intel.c - Consolidate bitfields
      7c4112a2
    • Takashi Iwai's avatar
      Merge branch 'fix/asoc' into for-linus · 1e2ae4dd
      Takashi Iwai authored
      * fix/asoc:
        ASoC: OMAP: Fix FS polarity in OSK5912 machine driver
        ASoC: OMAP: Fix DSP_B format in OMAP McBSP DAI driver
        ASoC: Fix include build error in s3c2412-i2s.c
        ASoC: Fix s3c-i2s-v2.c snd_soc_dai changes
        ASoC: s3c-i2s-v2.c fix for s3c_i2sv2_iis_calc_rate
        ASoC: Fix jive_wm8750.c build problems
        ASoC: pxa-ssp: allow setting of dai format 0
      1e2ae4dd
    • Linus Torvalds's avatar
      Remove 'recurse into child resources' logic from 'reserve_region_with_split()' · ff54250a
      Linus Torvalds authored
      This function is not actually used right now, since the original use
      case for it was done with insert_resource_expand_to_fit() instead.
      
      However, we now have another usage case that wants to basically do a
      "reserve IO resource, splitting around existing resources", however that
      one doesn't actually want the "recurse into the conflicting resource"
      logic at all.
      
      And since recursing into the conflicting resource was the most complex
      part, and isn't wanted, just remove it.  Maybe we'll some day want both
      versions, but we can just resurrect the logic then.
      Tested-by: default avatarYinghai Lu <yinghai@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      ff54250a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 8d4ab5da
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: when renaming don't try to unlink negative dentry
        cifs: remove unneeded bcc_ptr update in CIFSTCon
        cifs: add cFYI messages with some of the saved strings from ssetup/tcon
        cifs: fix buffer size for tcon->nativeFileSystem field
        cifs: fix unicode string area word alignment in session setup
        [CIFS] Fix build break caused by change to new current_umask helper function
        [CIFS] Fix sparse warnings
        [CIFS] Add support for posix open during lookup
        cifs: no need to use rcu_assign_pointer on immutable keys
        cifs: remove dnotify thread code
        [CIFS] remove some build warnings
        cifs: vary timeout on writes past EOF based on offset (try #5)
        [CIFS] Fix build break from recent DFS patch when DFS support not enabled
        Remote DFS root support.
        [CIFS] Endian convert UniqueId when reporting inode numbers from server files
        cifs: remove some pointless conditionals before kfree()
        cifs: flush data on any setattr
      8d4ab5da
  2. 18 Apr, 2009 10 commits
  3. 17 Apr, 2009 24 commits