commit 1309d4e68497184d2fd87e892ddf14076c2bda98
Merge: 101142c... 5410f72...
Author: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date:   Fri Feb 15 15:29:23 2008 -0800

    Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
    
    * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
      ata: fix sparse warning in pata_acpi.c
      ata: fix sparse warning in pata_marvell.c
      ata: fix sparse warning in pata_jmicron.c
      ata: fix sparse warning in pata_cs5536.c
      ata: sparse fixes for pata_amd.c
      pata_scc.c: add thaw ops
      pata_cs5536.c bugfix
      pata_legacy: don't call ata_host_detach() after initialization failure
      ata: fix sparse warnings in sata_mv.c
      ata: fix sparse warning in sata_via.c
      ata: fix sparse warning in sata_promise.c
      ata: fix sparse warning in ata_piix.c
      ata: fix sparse warning in libata-core.c
      ata: make ata_scsiop_inq_89 static in libata-scsi.c

commit 5410f729e331bd607d99057ece59f6d7866cd3dc
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed Feb 13 21:14:31 2008 -0800

    ata: fix sparse warning in pata_acpi.c
    
    drivers/ata/pata_acpi.c:80:2: warning: returning void-valued expression
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 42268e26aa9d2b6d0d1f890c354447f185fc2624
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed Feb 13 21:14:29 2008 -0800

    ata: fix sparse warning in pata_marvell.c
    
    drivers/ata/pata_marvell.c:88:2: warning: returning void-valued expression
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit ef2f2e4911654f0bc3b432b3d27e7c4d992efb7b
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed Feb 13 21:14:26 2008 -0800

    ata: fix sparse warning in pata_jmicron.c
    
    drivers/ata/pata_jmicron.c:118:2: warning: returning void-valued expression
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 2072fb55cf2400f2f7f4b47849b69f440bb9808f
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed Feb 13 21:14:23 2008 -0800

    ata: fix sparse warning in pata_cs5536.c
    
    Everybody passes in a u32...why fight it.
    
    drivers/ata/pata_cs5536.c:124:26: warning: incorrect type in argument 3 (different signedness)
    drivers/ata/pata_cs5536.c:124:26:    expected int *val
    drivers/ata/pata_cs5536.c:124:26:    got unsigned int *<noident>
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit d98f88c222bf56cfa5839930fb0d0af22d1c36bf
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed Feb 13 21:14:20 2008 -0800

    ata: sparse fixes for pata_amd.c
    
    drop return statement.
    drivers/ata/pata_amd.c:149:2: warning: returning void-valued expression
    
    Commit ce54d1616302117fa98513ae916bb3333e1c02ea pata_amd: update mode selection for NV PATAs
    
    added the initializer for nv_mode_filter but missed deleting the previously
    set mode_filter
    
    drivers/ata/pata_amd.c:509:3: warning: Initializer entry defined twice
    drivers/ata/pata_amd.c:521:3:   also defined here
    drivers/ata/pata_amd.c:544:3: warning: Initializer entry defined twice
    drivers/ata/pata_amd.c:556:3:   also defined here
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 1ec414ecc0fe09a610dfafcc6958103a37b7eb0f
Author: Akira Iguchi <akira2.iguchi@toshiba.co.jp>
Date:   Wed Feb 13 11:55:07 2008 +0900

    pata_scc.c: add thaw ops
    
    This patch adds default thaw ops and fixes the freeze/thaw inconsistency.
    
    Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
    Signed-off-by: Akira Iguchi <akira2.iguchi@toshiba.co.jp>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit b6966a61a8b5df2987856c81f39a8fd014d32a80
Author: Martin K. Petersen <martin.petersen@oracle.com>
Date:   Wed Feb 13 01:41:44 2008 -0500

    pata_cs5536.c bugfix
    
    Fix speed negotiation for secondary device.
    
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 7a3a16fe7ddf0570e2fcf286d7e244a5e1e16f6a
Author: Tejun Heo <htejun@gmail.com>
Date:   Wed Feb 13 18:20:19 2008 +0900

    pata_legacy: don't call ata_host_detach() after initialization failure
    
    ata_host_detach() detaches an attached port and shouldn't be called on
    a port which hasn't been attached yet.  pata_legacy incorrectly calls
    ata_host_detach() on unattached port after initialization failure
    causing oops.  Fix it.
    
    Signed-off-by: Tejun Heo <htejun@gmail.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Arjan van de Ven <arjan@infradead.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 5ab063e397d9f6fcadb37a07465efcc87f9e9345
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed Feb 13 21:14:14 2008 -0800

    ata: fix sparse warnings in sata_mv.c
    
    pp is never used again in this function, no need to declare a
    new one.
    
    drivers/ata/sata_mv.c:1545:24: warning: symbol 'pp' shadows an earlier one
    drivers/ata/sata_mv.c:1501:22: originally declared here
    drivers/ata/sata_mv.c:1553:24: warning: symbol 'pp' shadows an earlier one
    drivers/ata/sata_mv.c:1501:22: originally declared here
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 48e1f800eaa08eefe00476b83a7983b707d31848
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed Feb 13 21:14:11 2008 -0800

    ata: fix sparse warning in sata_via.c
    
    drivers/ata/sata_via.c:336:2: warning: returning void-valued expression
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 6903c0f7efe907ada1b9636b52c5ae11fd51ab68
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed Feb 13 21:14:08 2008 -0800

    ata: fix sparse warning in sata_promise.c
    
    drivers/ata/sata_promise.c:546:15: warning: symbol 'len' shadows an earlier one
    drivers/ata/sata_promise.c:538:6: originally declared here
    
    len is set again immediately after the loop, so this is safe.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 018d982721209241ede1180aa795d68833c26b10
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Wed Feb 13 21:14:05 2008 -0800

    ata: fix sparse warning in ata_piix.c
    
    drivers/ata/ata_piix.c:1655:8: warning: symbol 'rc' shadows an earlier one
    drivers/ata/ata_piix.c:1616:6: originally declared here
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit eeb37ac87459f8e86d53243bd97e0c086de7eb87
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu Feb 14 10:45:23 2008 -0800

    ata: fix sparse warning in libata-core.c
    
    rc is used to test the return value and possibly return an error.
    No need to redeclare inside the loop.
    
    drivers/ata/libata-core.c:7089:7: warning: symbol 'rc' shadows an earlier one
    drivers/ata/libata-core.c:7030:9: originally declared here
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>

commit 08f01058fe8fcf0d4d69d96d667c51d52859b31d
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Thu Feb 14 10:45:20 2008 -0800

    ata: make ata_scsiop_inq_89 static in libata-scsi.c
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>