1. 16 Feb, 2012 16 commits
  2. 14 Feb, 2012 14 commits
  3. 13 Feb, 2012 10 commits
    • Linus Torvalds's avatar
      Merge tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery-urgent · 3b582f39
      Linus Torvalds authored
      Just a few small fixes for a bunch of drivers. Nothing noteworthy.
      
      * tag 'battery-fixes-for-v3.3-rc2' of git://git.infradead.org/users/cbou/battery-urgent:
        lp8727_charger: Add terminating entry for i2c_device_id table
        power_supply: Fix modalias for charger-manager
        lp8727_chager: Fix permissions on a header file
        bq27x00_battery: Fix flag register read
        Revert "bq27x00_battery: Fix reporting status value for bq27500 battery"
      3b582f39
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 19be13cf
      Linus Torvalds authored
      Two bugfixes in XFS for 3.3: one fix passes KMEM_SLEEP to kmem_realloc
      instead of 0, and the other resolves a possible deadlock in xfs quotas.
      
      * 'for-linus' of git://oss.sgi.com/xfs/xfs:
        xfs: use a normal shrinker for the dquot freelist
        xfs: pass KM_SLEEP flag to kmem_realloc() in xlog_recover_add_to_cnt_trans()
      19be13cf
    • Linus Torvalds's avatar
      Merge branch 'omap-fixes-warnings' of git://git.linaro.org/people/rmk/linux-arm · b14a2998
      Linus Torvalds authored
      This set of changes are fixing various section mismatch warnings which
      look to be completely valid.  Primerily, those which are fixed are those
      which can cause oopses by manipulation of driver binding via sysfs.  For
      example: calling code marked __init from driver probe __devinit
      functions.
      
      Some of these changes will be reworked at the next merge window when the
      underlying reasons are sorted out.  In the mean time, I think it's
      important to have this fixed for correctness.
      
      Also included in this set are fixes to various error messages in OMAP -
      including making them gramatically correct, fixing a few spelling
      errors, and more importantly, making them greppable by unwrapping them.
      
      Tony Lindgren has acked all these patches, put them out for testing a
      week ago, and I've tested them on the platforms I have.
      
      * 'omap-fixes-warnings' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: omap: resolve nebulous 'Error setting wl12xx data'
        ARM: omap: fix wrapped error messages in omap_hwmod.c
        ARM: omap: fix section mismatch warnings in mux.c caused by hsmmc.c
        ARM: omap: fix section mismatch warning for sdp3430_twl_gpio_setup()
        ARM: omap: fix section mismatch error for omap_4430sdp_display_init()
        ARM: omap: fix section mismatch warning for omap_secondary_startup()
        ARM: omap: preemptively fix section mismatch in omap4_sdp4430_wifi_mux_init()
        ARM: omap: fix section mismatch warning in mux.c
        ARM: omap: fix section mismatch errors in TWL PMIC driver
        ARM: omap: fix uninformative vc/i2c configuration error message
        ARM: omap: fix vc.c PMIC error message
        ARM: omap: fix prm44xx.c OMAP44XX_IRQ_PRCM build error
      b14a2998
    • Linus Torvalds's avatar
      Merge branch 'omap-fixes-urgent' of git://git.linaro.org/people/rmk/linux-arm · a269c2f5
      Linus Torvalds authored
      This pull request covers the major oopsing issues with OMAP, caused by
      the lack of the TWL driver.  Even when the TWL driver is not built in,
      we shouldn't oops.
      
      * 'omap-fixes-urgent' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: omap: fix broken twl-core dependencies and ifdefs
        ARM: omap: fix oops in drivers/video/omap2/dss/dpi.c
        ARM: omap: fix oops in arch/arm/mach-omap2/vp.c when pmic is not found
      a269c2f5
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · ed5016d7
      Linus Torvalds authored
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7322/1: Print BUG instead of undefined instruction on BUG_ON()
        ARM: 7321/1: cache-v7: Disable preemption when reading CCSIDR
        ARM: 7320/1: Fix proc_info table alignment
      ed5016d7
    • Linus Torvalds's avatar
      i387: make irq_fpu_usable() tests more robust · 5b1cbac3
      Linus Torvalds authored
      
      
      Some code - especially the crypto layer - wants to use the x86
      FP/MMX/AVX register set in what may be interrupt (typically softirq)
      context.
      
      That *can* be ok, but the tests for when it was ok were somewhat
      suspect.  We cannot touch the thread-specific status bits either, so
      we'd better check that we're not going to try to save FP state or
      anything like that.
      
      Now, it may be that the TS bit is always cleared *before* we set the
      USEDFPU bit (and only set when we had already cleared the USEDFP
      before), so the TS bit test may actually have been sufficient, but it
      certainly was not obviously so.
      
      So this explicitly verifies that we will not touch the TS_USEDFPU bit,
      and adds a few related sanity-checks.  Because it seems that somehow
      AES-NI is corrupting user FP state.  The cause is not clear, and this
      patch doesn't fix it, but while debugging it I really wanted the code to
      be more obviously correct and robust.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5b1cbac3
    • Linus Torvalds's avatar
      i387: math_state_restore() isn't called from asm · be98c2cd
      Linus Torvalds authored
      
      
      It was marked asmlinkage for some really old and stale legacy reasons.
      Fix that and the equally stale comment.
      
      Noticed when debugging the irq_fpu_usable() bugs.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      be98c2cd
    • Takashi Iwai's avatar
      Merge branch 'fix/acer-alc889-fix' into fix/hda · a68f20ef
      Takashi Iwai authored
      Conflicts:
      	sound/pci/hda/patch_realtek.c
      
      Merged back the fix for Acer Aspire 6935 with ALC889 codec.
      The fix commit was based on 3.2 kernel so that it can be applied to
      stable kernel cleanly.
      a68f20ef
    • Takashi Iwai's avatar
      ALSA: hda - Fix silent speaker output on Acer Aspire 6935 · 02a237b2
      Takashi Iwai authored
      Since 3.2 kernel, the driver starts trying to assign the multi-io DACs
      before the speaker, thus it assigns DAC2/3 for multi-io and DAC4 for
      the speaker for a standard laptop setup like a HP, a speaker, a mic-in
      and a line-in.  However, on Acer Aspire 6935, it seems that the
      speaker pin 0x14 must be connected with either DAC1 or 2; otherwise it
      results in silence by some reason, although the codec itself allows
      the routing to DAC3/4.
      
      As a workaround, the connection list of each pin is reduced to be
      mapped to either only DAC1/2 or DAC3/4, so that the compatible
      assignment as in kernel 3.1 is achieved.
      
      Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42740
      
      
      
      Cc: <stable@kernel.org> [v3.2+]
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      02a237b2
    • Takashi Iwai's avatar
      ALSA: hda - Fix initialization of secondary capture source on VT1705 · fc1156c0
      Takashi Iwai authored
      
      
      VT1705 codec has two ADCs where the secondary ADC has no MUX but only
      a fixed connection to the mic pin.  This confused the driver and it
      tries always overriding the input-source selection by assumption of
      the existing MUX for the secondary ADC, resulted in resetting the
      input-source at each time PM (including power-saving) occurs.
      
      The fix is simply to check the existence of MUX for secondary ADCs in
      the initialization code.
      Tested-by: default avatarAnisse Astier <anisse@astier.eu>
      Cc: <stable@kernel.org> [v3.1+]
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      fc1156c0