commit bef69ea0dcce574a425feb0a5aa4c63dd108b9a6
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Aug 29 20:18:31 2008 -0700

    Resource handling: add 'insert_resource_expand_to_fit()' function
    
    Not used anywhere yet, but this complements the existing plain
    'insert_resource()' functionality with a version that can expand the
    resource we are adding in order to fix up any conflicts it has with
    existing resources.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 00aeb429a0f2daeb21979873060b81095cafe4bd
Merge: 316d967... df91bc2...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Aug 29 14:46:49 2008 -0700

    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:
      ALSA: oxygen: fix distorted output on AK4396-based cards
      Revert "ALSA: hda - Added model selection for iMac 24""

commit 316d9679f33caf7e683471647d1472bfe133d858
Author: Andi Kleen <andi@firstfloor.org>
Date:   Fri Aug 29 20:06:23 2008 +0200

    Don't trigger softlockup detector on network fs blocked tasks
    
    Pulling the ethernet cable on a 2.6.27-rc system with NFS mounts
    currently leads to an ongoing flood of soft lockup detector backtraces
    for all tasks blocked on the NFS mounts when the hickup takes
    longer than 120s.
    
    I don't think NFS problems should be all that noisy.
    
    Luckily there's a reasonably easy way to distingush this case.
    
    Don't report task softlockup warnings for tasks in TASK_KILLABLE
    state, which is used by the network file systems.
    
    I believe this patch is a 2.6.27 candidate.
    
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit b4609472116bb806a95e98d04767189406c74c70
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Fri Aug 29 14:38:03 2008 -0700

    Revert "x86: fix HPET regression in 2.6.26 versus 2.6.25, check hpet against BAR, v3"
    
    This reverts commit a2bd7274b47124d2fc4dfdb8c0591f545ba749dd.
    
    It wasn't really right to begin with (there's a better fix for the
    problem with e820 reservations clashing with PCI BAR's pending), but it
    also actually causes more regressions, so it should be reverted even
    before the better fix is finalized.
    
    Rafael reports that this commit broke AHCI detection, and thus causes
    the kernel to not boot on his quad core test box.
    
    Reported-and-bisected-by: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Yinghai Lu <yhlu.kernel@gmail.com>
    Cc: David Witbrodt <dawitbro@sbcglobal.net>
    Cc: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit df91bc23dcb052ff2da71b3482bf3c5fbf4b8a53
Author: Clemens Ladisch <clemens@ladisch.de>
Date:   Fri Aug 29 13:08:34 2008 +0200

    ALSA: oxygen: fix distorted output on AK4396-based cards
    
    When changing the sample rate, the CMI8788's master clock output becomes
    unstable for a short time.  The AK4396 needs the master clock to do SPI
    writes, so writing to an AK4396 control register directly after a sample
    rate change will garble the value.  In our case, this leads to the DACs
    being misconfigured to I2S sample format, which results in a wrong
    output level and horrible distortions on samples louder than -6 dB.
    
    To fix this, we need to wait until the new master clock signal has
    become stable before doing SPI writes.
    
    Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 93a1a5eb70be5cc14990b97ef2460212e32658dc
Author: Takashi Iwai <tiwai@suse.de>
Date:   Wed Aug 27 07:56:43 2008 +0200

    Revert "ALSA: hda - Added model selection for iMac 24""
    
    This reverts commit 3e0e469fa216ec70c93b1593821b759d19ee2e6b.
    
    The patch introduced a wrong detection of other intel Macs with
    ALC88* codec because they share the same PCI SSID (but have different
    codec subsystem-IDs).  See http://lkml.org/lkml/2008/8/24/143
    
    Reported-and-tested-by: Guillaume Chazarain <guichaz@gmail.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>