1. 24 Jul, 2008 33 commits
  2. 23 Jul, 2008 7 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc · 20b7997e
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
        sdhci: highmem capable PIO routines
        sg: reimplement sg mapping iterator
        mmc_test: print message when attaching to card
        mmc: Remove Russell as primecell mci maintainer
        mmc_block: bounce buffer highmem support
        sdhci: fix bad warning from commit c8b3e02e
        sdhci: add warnings for bad buffers in ADMA path
        mmc_test: test oversized sg lists
        mmc_test: highmem tests
        s3cmci: ensure host stopped on machine shutdown
        au1xmmc: suspend/resume implementation
        s3cmci: fixes for section mismatch warnings
        pxamci: trivial fix of DMA alignment register bit clearing
      20b7997e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · 5554b359
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (24 commits)
        I/OAT: I/OAT version 3.0 support
        I/OAT: tcp_dma_copybreak default value dependent on I/OAT version
        I/OAT: Add watchdog/reset functionality to ioatdma
        iop_adma: cleanup iop_chan_xor_slot_count
        iop_adma: document how to calculate the minimum descriptor pool size
        iop_adma: directly reclaim descriptors on allocation failure
        async_tx: make async_tx_test_ack a boolean routine
        async_tx: remove depend_tx from async_tx_sync_epilog
        async_tx: export async_tx_quiesce
        async_tx: fix handling of the "out of descriptor" condition in async_xor
        async_tx: ensure the xor destination buffer remains dma-mapped
        async_tx: list_for_each_entry_rcu() cleanup
        dmaengine: Driver for the Synopsys DesignWare DMA controller
        dmaengine: Add slave DMA interface
        dmaengine: add DMA_COMPL_SKIP_{SRC,DEST}_UNMAP flags to control dma unmap
        dmaengine: Add dma_client parameter to device_alloc_chan_resources
        dmatest: Simple DMA memcpy test client
        dmaengine: DMA engine driver for Marvell XOR engine
        iop-adma: fix platform driver hotplug/coldplug
        dmaengine: track the number of clients using a channel
        ...
      
      Fixed up conflict in drivers/dca/dca-sysfs.c manually
      5554b359
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb · 0f6e38a6
      Linus Torvalds authored
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
        kgdb: kgdboc console poll hooks for mpsc uart
        kgdb: kgdboc console poll hooks for cpm uart
        kgdb, powerpc: arch specific powerpc kgdb support
        kgdb: support for ARCH=arm
        kgdb: remove unused HAVE_ARCH_KGDB_SHADOW_INFO config variable
      0f6e38a6
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · e669e817
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (60 commits)
        ide: small whitespace fixes
        ide: ide-cd_ioctl.c fix sparse integer as NULL pointer warnings
        ide: ide-cd.c fix sparse endianness warnings
        ide-cd: convert to using the new atapi_flags
        ide: remove unused PC_FLAG_DRQ_INTERRUPT
        ide-scsi: convert to using the new atapi_flags
        ide-tape: convert to using the new atapi_flags
        ide-floppy: convert to using the new atapi_flags (take 2)
        ide: add per-device flags
        ide: use rq->cmd instead of pc->c in atapi common code
        ide-scsi: pass packet command in rq->cmd
        ide-tape: pass packet command in rq->cmd
        ide-tape: make room for packet command ids in rq->cmd
        ide-floppy: pass packet command in rq->cmd
        ide: remove pc->callback member from ide_atapi_pc
        ide-scsi: use drive->pc_callback instead of pc->callback
        ide-tape: use drive->pc_callback instead of pc->callback
        ide-floppy: use drive->pc_callback instead of pc->callback
        ide: push pc callback pointer into the ide_drive_t structure
        drivers/ide/ide-tape.c: remove double kfree
        ...
      e669e817
    • Pavel Machek's avatar
      ide: small whitespace fixes · fc410698
      Pavel Machek authored
      Small whitespace fixes for drivers/ide.
      Signed-off-by: default avatarPavel Machek <pavel@suse.cz>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      fc410698
    • Harvey Harrison's avatar
      ide: ide-cd_ioctl.c fix sparse integer as NULL pointer warnings · 1a677aba
      Harvey Harrison authored
      The function ide_cd_queue_pc should be checked as the bufflen arg is
      dereferenced and lots of callers are passing in NULL.
      
      drivers/ide/ide-cd_ioctl.c:124:46: warning: Using plain integer as NULL pointer
      drivers/ide/ide-cd_ioctl.c:149:47: warning: Using plain integer as NULL pointer
      drivers/ide/ide-cd_ioctl.c:231:46: warning: Using plain integer as NULL pointer
      drivers/ide/ide-cd_ioctl.c:374:46: warning: Using plain integer as NULL pointer
      Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Acked-by: default avatarBorislav Petkov <petkovbb@gmail.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      1a677aba
    • Harvey Harrison's avatar
      ide: ide-cd.c fix sparse endianness warnings · 141d3b27
      Harvey Harrison authored
      drivers/ide/ide-cd.c:1276:46: warning: Using plain integer as NULL pointer
      drivers/ide/ide-cd.c:1298:19: warning: cast to restricted __be32
      drivers/ide/ide-cd.c:1300:4: warning: cast to restricted __be32
      drivers/ide/ide-cd.c:1522:14: warning: cast to restricted __le16
      drivers/ide/ide-cd.c:1523:14: warning: cast to restricted __le16
      drivers/ide/ide-cd.c:1525:14: warning: cast to restricted __be16
      drivers/ide/ide-cd.c:1526:14: warning: cast to restricted __be16
      drivers/ide/ide-cd.c:1667:37: warning: cast to restricted __be16
      Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Acked-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
      Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      141d3b27