commit ff8b16d7e15a8ba2a6086645614a483e048e3fbf
Author: Wu Fengguang <fengguang.wu@intel.com>
Date:   Thu Nov 4 01:56:49 2010 +0800

    vmstat: fix offset calculation on void*
    
    Fix regression introduced by commit 79da826aee6 ("writeback: report
    dirty thresholds in /proc/vmstat").
    
    The incorrect pointer arithmetic can result in problems like this:
    
      BUG: unable to handle kernel paging request at 07c06d16
      IP: [<c050c336>] strnlen+0x6/0x20
      Call Trace:
       [<c050a249>] ? string+0x39/0xe0
       [<c042be6b>] ? __wake_up_common+0x4b/0x80
       [<c050afcc>] ? vsnprintf+0x1ec/0x380
       [<c04b380e>] ? seq_printf+0x2e/0x60
       [<c04829a6>] ? vmstat_show+0x26/0x30
       [<c04b3bb6>] ? seq_read+0xa6/0x380
       [<c04b3b10>] ? seq_read+0x0/0x380
       [<c04d5d2f>] ? proc_reg_read+0x5f/0x90
       [<c049c4a1>] ? vfs_read+0xa1/0x140
       [<c04d5cd0>] ? proc_reg_read+0x0/0x90
       [<c049c981>] ? sys_read+0x41/0x70
       [<c0402bd0>] ? sysenter_do_call+0x12/0x26
    
    Reported-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Cc: Michael Rubin <mrubin@google.com>
    Signed-off-by: Wu Fengguang <fengguang.wu@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 81a6cff678ecee7cdc0658285d3150660c07cfce
Merge: d88c092 69dbdd8
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Wed Nov 3 13:44:55 2010 -0400

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ASoC: tpa6130a2: Get rid of compile warning from tpa6130a2_power
      ALSA: hda - MacBookAir3,1(3,2) alsa support
      ASoC: fix the building issue of missing codec field in 'struct snd_soc_card'
      ALSA: usb-audio - Support for Power/Status LED on Creative USB X-Fi S51
      ALSA: asihpi - Unsafe memory management when allocating control cache
      ASoC: Update WARN uses in wm_hubs
      ASoC: Include cx20442 to SND_SOC_ALL_CODECS
      ASoC: Fix SND_SOC_ALL_CODECS typo for jz4740
      ASoC: Remove volatility from WM8900 POWER1 register
      ALSA: lx6464es - make 1 bit signed bitfield unsigned
      ALSA: cs46xx memory management fixes for cs46xx_dsp_spos_create()
      ALSA: usb - driver neglects kmalloc return value check and may deref NULL
      ASoC: tpa6130a2: Fix unbalanced regulator disables
      ASoC: tlv320dac33: Mode1 FIFO auto configuration fix
      ASoC: tlv320dac33: Limit the US_TO_SAMPLES macro
      ASoC: tlv320dac33: Error handling for broken chip
      ASoC: Check return value of struct_strtoul() in pmdown_time_set()

commit 69dbdd819599e2f3b77c172e83af512845bca5ad
Merge: 87232dd 75e3f31
Author: Takashi Iwai <tiwai@suse.de>
Date:   Wed Nov 3 15:51:26 2010 +0100

    Merge branch 'fix/asoc' into for-linus

commit 75e3f3137cb570661c2ad3035a139dda671fbb63
Author: Jarkko Nikula <jhnikula@gmail.com>
Date:   Wed Nov 3 16:39:00 2010 +0200

    ASoC: tpa6130a2: Get rid of compile warning from tpa6130a2_power
    
    Patch "ASoC: tpa6130a2: Fix unbalanced regulator disables" introduced a
    compiler warning "‘ret’ may be used uninitialized in this function".
    Initialize ret to zero to get rid of it and making sure that the function
    does not return any random error code when the code is falling through.
    
    Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit cf78c0c4267c37f2f98cb03a73c0a99c2cdaef87
Merge: 29c798f 63f7526
Author: Takashi Iwai <tiwai@suse.de>
Date:   Wed Nov 3 13:56:08 2010 +0100

    Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc

commit 87232dd49aeb6b7d1af291edca8bd129a82ef4b5
Author: Edgar (gimli) Hucek <gimli@dark-green.com>
Date:   Wed Nov 3 08:14:10 2010 +0100

    ALSA: hda - MacBookAir3,1(3,2) alsa support
    
    This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the alsa
    sound system.
    
    Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit d88c0922fa0e2c021a028b310a641126c6d4b7dc
Author: Michel Lespinasse <walken@google.com>
Date:   Tue Nov 2 13:05:18 2010 -0700

    Release page reference during page fault retry
    
    This slipped by when unifying the filemap and swap versions of
    lock_page_or_retry()...
    
    Signed-off-by: Michel Lespinasse <walken@google.com>
    Acked-by: Rik van Riel <riel@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit eb8abb927ae2fd1730e24ea94cd9527f3c086292
Author: Theodore Ts'o <tytso@mit.edu>
Date:   Tue Nov 2 09:34:50 2010 -0400

    ext4: Remove useless spinlock in ext4_getattr()
    
    Linus noted, and complained to me, that doing while lots of "git diff"'s
    of kernel sources, these spinlocks were responsible for 27% of the
    spinlock cost on his two-processor system as reported by perf.
    
    Git was doing lots of parallel stats, and this was putting a lot of
    pressure on ext4_getattr().  A spinlock to protect a single
    memory-to-memory copy is pointless, so remove it.
    
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 29c798fecb9b846b363b0a02fa662ff42fc19426
Merge: cb99062 c8ddb27
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Tue Nov 2 09:41:56 2010 -0400

    Merge commit 'v2.6.37-rc1' into for-2.6.37

commit cb9906229595941d632fc4022b05da4f9533856a
Author: Eric Miao <eric.y.miao@gmail.com>
Date:   Tue Nov 2 05:10:07 2010 +0800

    ASoC: fix the building issue of missing codec field in 'struct snd_soc_card'
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 7fe19da4ca38fc20cdbc7020fcf2eca8fc756410
Author: Arnd Bergmann <arnd@arndb.de>
Date:   Thu Oct 28 16:12:33 2010 +0200

    preempt: fix kernel build with !CONFIG_BKL
    
    The preempt count logic tries to take the BKL into account, which breaks
    when CONFIG_BKL is not set.
    
    Use the same preempt_count offset that we use without CONFIG_PREEMPT
    when CONFIG_BKL is disabled.
    
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    Reported-and-tested-by: Kirill A. Shutemov <kirill@shutemov.name>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit ca8dc34eaf7a1db7daa604495ed2c143af32f1ed
Author: Mandar Joshi <emailmandar@gmail.com>
Date:   Tue Nov 2 14:43:19 2010 +0000

    ALSA: usb-audio - Support for Power/Status LED on Creative USB X-Fi S51
    
    This patch adds support for Power/Status LED on Creative USB X-Fi S51.
    There is just one LED on the device. The LED can either be On or it
    can be set to Blink. There doesn't seem to be a way to switch it off.
    The control message to change LED status is similar to that of
    audigy2nx except that the index is to be set to 0 and value is 1 for
    Blink and 0 for On.
    
    The 'Power LED' control in alsamixer when muted will cause the LED to
    Blink continuously. When unmuted  the LED will stay On. The Creative
    driver under Windows sets the LED to blink whenever audio is muted.
    This LED can be treated as the CMSS LED but I figured since there is
    just one LED, it should be treated as the Power LED. Is that alright?
    
    I've also changed the comment "Usb X-Fi" to "Usb X-Fi S51" as there
    are other external X-Fi devices from Creative like Usb X-Fi Go and
    Xmod. The volume knob and LED support patch doesn't apply to them.
    
    Signed-off-by: Mandar Joshi <emailmandar@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit fd0977d0f42d3e73121b88f57c7d48ca9b861a58
Author: Jesper Juhl <jj@chaosbits.net>
Date:   Fri Oct 29 21:35:25 2010 +0200

    ALSA: asihpi - Unsafe memory management when allocating control cache
    
    I noticed that sound/pci/asihpi/hpicmn.c::hpi_alloc_control_cache() does
    not check the return value from kmalloc(), which may fail.
    If kmalloc() fails we'll dereference a null pointer and things will go bad
    fast.
    There are two memory allocations in that function and there's also the
    problem that the first may succeed and the second may fail and nothing is
    done about that either which will also go wrong down the line.
    
    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Acked-by: Eliot Blennerhassett <linux@audioscience.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 020e773f6b2e797a13d23723773ed1b3ba2c35dc
Author: Andy Whitcroft <apw@canonical.com>
Date:   Mon Nov 1 21:01:44 2010 +0000

    kconfig: sym_expand_string_value: allow for string termination when reallocing
    
    When expanding a parameterised string we may run out of space, this
    triggers a realloc.  When computing the new allocation size we do not
    allow for the terminating '\0'.  Allow for this when calculating the new
    length.
    
    Signed-off-by: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e99d11d19977c74b18411cdb59cdebb788237a6e
Author: Paul Mundt <lethal@linux-sh.org>
Date:   Tue Nov 2 05:29:21 2010 +0900

    fs: logfs: Fix up MTD=y build.
    
    Commit 7d945a3aa760 ("logfs get_sb, part 3") broke the logfs build when
    CONFIG_MTD is set due to a mangled logfs_get_sb_mtd() definition.
    
    Signed-off-by: Paul Mundt <lethal@linux-sh.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5a0b07433ddd808ecbb5f4287b61be6fa7af1b57
Author: Joe Perches <joe@perches.com>
Date:   Sat Oct 30 14:08:56 2010 -0700

    ASoC: Update WARN uses in wm_hubs
    
    Add missing newlines.
    
    Signed-off-by: Joe Perches <joe@perches.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 76a6106f124e375df0ea6ba6bcf204b8caff786a
Author: Jarkko Nikula <jhnikula@gmail.com>
Date:   Fri Oct 29 16:47:45 2010 +0300

    ASoC: Include cx20442 to SND_SOC_ALL_CODECS
    
    Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 703dde6219346bc3b7d41d4fa2c36846d728e52c
Author: Jarkko Nikula <jhnikula@gmail.com>
Date:   Fri Oct 29 16:47:44 2010 +0300

    ASoC: Fix SND_SOC_ALL_CODECS typo for jz4740
    
    Include jz4740.c to SND_SOC_ALL_CODECS when the dependencies are met.
    
    Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

commit 6d212d8e86fb4221bd91b9266b7567ee2b83bd01
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Fri Oct 29 15:41:17 2010 -0700

    ASoC: Remove volatility from WM8900 POWER1 register
    
    Not all bits can be read back from POWER1 so avoid corruption when using
    a read/modify/write cycle by marking it non-volatile - the only thing we
    read back from it is the chip revision which has diagnostic value only.
    We can re-add later but that's a more invasive change than is suitable
    for a bugfix.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Cc: stable@kernel.org

commit f7467452291f7c9e5e1271e8c8e45b77f34b1257
Author: Tim Blechmann <tim@klingt.org>
Date:   Sun Oct 31 19:46:19 2010 +0100

    ALSA: lx6464es - make 1 bit signed bitfield unsigned
    
    converts a 1 bit signed bitfield to an unsigned.
    
    Reported-by: Dr. David Alan Gilbert <linux@treblig.org>
    Signed-off-by: Tim Blechmann <tim@klingt.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit bb617ee3f82ba94072c8b08043d9166bbfe397a2
Author: Jesper Juhl <jj@chaosbits.net>
Date:   Fri Oct 29 22:54:45 2010 +0200

    ALSA: cs46xx memory management fixes for cs46xx_dsp_spos_create()
    
    When reading through sound/pci/cs46xx/dsp_spos.c I noticed a couple of
    things in cs46xx_dsp_spos_create().
    
    It seems to me that we don't always free the various memory buffers we
    allocate and we also do some work (structure member assignment) early,
    that is completely pointless if some of the memory allocations fail and
    we end up just aborting the whole thing.
    
    I don't have hardware to test, so the patch below is compile tested only,
    but it makes the following changes:
    
    - Make sure we always free all allocated memory on failures.
    - Don't do pointless work assigning to structure members before we know
      all memory allocations, that may abort progress, have completed
      successfully.
    - Remove some trailing whitespace.
    
    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Tested-by: Ondrej Zary <linux@rainbow-software.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 8a8d56b2a2f9aa423c3d8b6b1e2792c0492059ed
Author: Jesper Juhl <jj@chaosbits.net>
Date:   Fri Oct 29 20:40:23 2010 +0200

    ALSA: usb - driver neglects kmalloc return value check and may deref NULL
    
    sound/usb/pcm.c::snd_usb_pcm_check_knot() fails to check the return value
    from kmalloc() and may end up dereferencing a null pointer.
    The patch below (compile tested only) should take care of that little
    problem.
    
    Signed-off-by: Jesper Juhl <jj@chaosbits.net>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 63f7526f26f0a9291ac3f7a986aa18ebfb61ec19
Author: Jarkko Nikula <jhnikula@gmail.com>
Date:   Thu Oct 28 14:05:40 2010 +0300

    ASoC: tpa6130a2: Fix unbalanced regulator disables
    
    This driver has unbalanced regulator_disable when doing module loading and
    unloading. This is because tpa6130a2_probe followed by tpa6130a2_remove
    calls twice tpa6130a2_power(0). Fix this by implementing a state checking
    in tpa6130a2_power.
    
    Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
    Cc: Peter Ujfalusi <peter.ujfalusi@nokia.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

commit 1bc13b2e3518ff7856924d7c2bdf06196f605260
Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Date:   Fri Oct 29 09:49:37 2010 +0300

    ASoC: tlv320dac33: Mode1 FIFO auto configuration fix
    
    Do not allow invalid (too big) nSample value, when FIFO Mode1
    and automatic fifo configuration has been selected.
    
    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

commit d54e1f4fdf4cf9754b7220ae4cb66dcae0fc1702
Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Date:   Fri Oct 29 14:07:25 2010 +0300

    ASoC: tlv320dac33: Limit the US_TO_SAMPLES macro
    
    Limit the time window to maximum 1s in the macro.
    The driver deals with much shorter times (<200ms).
    This will fix a rare division by zero bug in Mode1.
    This could happen, when the work is not executed in
    time (within mode1_latency) after the interrupt.
    In this case the DAC33 will not receive the needed
    nSample command in time, and enters to an unknown
    state, and won't recover.
    In such event the time window will increase, and
    eventually going to be bigger than 1s, resulting
    devision by zero.
    
    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

commit 911a0f0bfc01750590e8ac6e7f9f4921f470b0d1
Author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Date:   Tue Oct 26 11:45:59 2010 +0300

    ASoC: tlv320dac33: Error handling for broken chip
    
    Correct/Implement handling of broken chip.
    Fail the soc_prope if the communication with the chip
    fails (can not read chip ID).
    
    Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
    Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>

commit c593b520cf70b0672680da04cc1e8c5f93bd739d
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Wed Oct 27 20:11:17 2010 -0700

    ASoC: Check return value of struct_strtoul() in pmdown_time_set()
    
    strict_strtoul() has just been made must check so do so.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>