commit 3ad4f597058301c97f362e500a32f63f5c950a45
Merge: 8a8bc22... 6b42566...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 10 09:13:37 2008 -0800

    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: hda - Make the HP EliteBook 8530p use AD1884A model laptop
      ALSA: gusextreme: Fix build errors
      ALSA: hdsp: check for iobox and upload firmware during ioctl
      ALSA: HDSP: check for io box before uploading firmware
      ALSA: hda - Add another HP model (6730s) for AD1884A
      alsa: fix snd_BUG_on() and friends
      ALSA: hda - Add a quirk for MEDION MD96630
      ALSA: hda - Limit the number of GPIOs show in proc

commit 6b425660f45cdea177fe95388e081afa947b1506
Merge: 7aeb6d7... 0f101fa... 2542483...
Author: Takashi Iwai <tiwai@suse.de>
Date:   Mon Nov 10 17:58:46 2008 +0100

    Merge branches 'topic/fix/misc' and 'topic/fix/hda' into for-linus

commit 254248313aed7e6ff295ca21a82ca989b1f69c16
Author: Travis Place <wishie@wishie.net>
Date:   Mon Nov 10 17:56:23 2008 +0100

    ALSA: hda - Make the HP EliteBook 8530p use AD1884A model laptop
    
    Added a QUIRK to patch_analog.c for the HP Elitebook 8530p
    (IDs 0x103c:0x30e7) to use AD1884A model 'laptop' by default.
    Playback and Capture confirmed working.
    
    Signed-off-by: Travis Place <wishie@wishie.net>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 8a8bc22332ee6ea49137508467a76aa7f4367719
Author: Tejun Heo <tj@kernel.org>
Date:   Mon Nov 10 14:48:21 2008 +0900

    libata: revert convert-to-block-tagging patches
    
    This patch reverts the following three commits which convert libata to
    use block layer tagging.
    
     43a49cbdf31e812c0d8f553d433b09b421f5d52c
     e013e13bf605b9e6b702adffbe2853cfc60e7806
     2fca5ccf97d2c28bcfce44f5b07d85e74e3cd18e
    
    Although using block layer tagging is the right direction, due to the
    tight coupling among tag number, data structure allocation and
    hardware command slot allocation, libata doesn't work correctly with
    the current conversion.
    
    The biggest problem is guaranteeing that tag 0 is always used for
    non-NCQ commands.  Due to the way blk-tag is implemented and how SCSI
    starts and finishes requests, such guarantee can't be made.  I'm not
    sure whether this would actually break any low level driver but it
    doesn't look like a good idea to break such assumption given the
    frailty of ATA controllers.
    
    So, for the time being, keep using the old dumb in-libata qc
    allocation.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Jens Axobe <jens.axboe@oracle.com>
    Cc: Jeff Garzik <jeff@garzik.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 0f101fa6bccdc797ddcee40fd4c55e879155a40f
Author: Ville Syrjala <syrjala@sci.fi>
Date:   Sun Nov 9 20:32:40 2008 +0200

    ALSA: gusextreme: Fix build errors
    
    gusextreme depends on opl3 support. Add the approriate select to Kconfig.
    Also remove the unnecessary hwdep select.
    
    Relevant build errors:
    ERROR: "snd_opl3_hwdep_new" [sound/isa/gus/snd-gusextreme.ko] undefined!
    ERROR: "snd_opl3_create" [sound/isa/gus/snd-gusextreme.ko] undefined!
    
    Signed-off-by: Ville Syrjala <syrjala@sci.fi>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 3ae7e2e22900b90bbe1d19454405950893c110be
Author: Tim Blechmann <tim@klingt.org>
Date:   Sat Nov 8 14:42:18 2008 +0100

    ALSA: hdsp: check for iobox and upload firmware during ioctl
    
    currently, the error message when trying to run hdspmixer or hdspconf
    if the breakout box is not connected is somehow misleading, since it
    asks the user to upload the firmware.
    
    this patch adds a test, whether the breakout box is connected and
    tries to upload the firmware in the case, that it is not present, e.g.
    because of power failures of the breakout box.
    
    [Minor coding-style fixes by tiwai]
    
    Signed-off-by: Tim Blechmann <tim@klingt.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 00c9ddd1d4cc73aa0077f379279d716cb0ab0ba5
Author: Tim Blechmann <tim@klingt.org>
Date:   Sun Nov 9 12:50:52 2008 +0100

    ALSA: HDSP: check for io box before uploading firmware
    
    currently the hdsp driver tries to upload the firmware, even if the
    io box is not connected. this patch adds a check for the io box
    before trying to upload the firmware.
    thus instead of messages complaining about the fifo status and firmware
    loading failure, the driver gives a message that no multiface or
    digiface is connected.
    
    [A minor coding-style fix by tiwai]
    
    Signed-off-by: Tim Blechmann <tim@klingt.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 65b92e5cbc8acd14ea83190b4d016f765dce6075
Author: Michel Marti <mma@objectxp.com>
Date:   Sat Nov 8 11:33:32 2008 +0100

    ALSA: hda - Add another HP model (6730s) for AD1884A
    
    Added model=laptop for another HP machine (103c:3614) with AD1884A
    codec.
    
    Signed-off-by: Michel Marti <mma@objectxp.com>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit fcef7836a31c6432b41a38867d413ed3d6aa8261
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Thu Nov 6 12:05:21 2008 -0800

    alsa: fix snd_BUG_on() and friends
    
    sound/pci/pcxhr/pcxhr_core.c: In function 'pcxhr_set_pipe_cmd_params':
    sound/pci/pcxhr/pcxhr_core.c:700: warning: statement with no effect
    sound/pci/pcxhr/pcxhr_core.c:706: warning: statement with no effect
    sound/pci/pcxhr/pcxhr_core.c:710: warning: statement with no effect
    
    Due to
    
    try to fix this, and be more conventional about the empty stubs.
    
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit 959973b92d3ba235edfa5dcb5df1be1e5d1deba2
Author: Takashi Iwai <tiwai@suse.de>
Date:   Wed Nov 5 11:30:56 2008 +0100

    ALSA: hda - Add a quirk for MEDION MD96630
    
    Use model=lenovo-ms7195-dig for MEDION MD96630 laptop (17c0:4085)
    with ALC888 codec.
    Reference: Novell bnc#412548
    	https://bugzilla.novell.com/show_bug.cgi?id=412528
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>

commit c4dc5071859bf666a5a9d6565f16c51a261a88b7
Author: Takashi Iwai <tiwai@suse.de>
Date:   Tue Nov 4 13:30:57 2008 +0100

    ALSA: hda - Limit the number of GPIOs show in proc
    
    Limit the number of GPIOs shown in proc.  Otherwise it gets too long
    unnecessarily, and hard to analyze.
    
    Signed-off-by: Takashi Iwai <tiwai@suse.de>