Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 · 27951daa
    Linus Torvalds authored
    * 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (28 commits)
      ide-tape: fix debug call
      alim15x3: Remove historical hacks, re-enable init_hwif for PowerPC
      ide-dma: don't reset request fields on dma_timeout_retry()
      ide: drop rq->data handling from ide_map_sg()
      ide-atapi: kill unused fields and callbacks
      ide-tape: simplify read/write functions
      ide-tape: use byte size instead of sectors on rw issue functions
      ide-tape: unify r/w init paths
      ide-tape: kill idetape_bh
      ide-tape: use standard data transfer mechanism
      ide-tape: use single continuous buffer
      ide-atapi,tape,floppy: allow ->pc_callback() to change rq->data_len
      ide-tape,floppy: fix failed command completion after request sense
      ide-pm: don't abuse rq->data
      ide-cd,atapi: use bio for internal commands
      ide-atapi: convert ide-{floppy,tape} to using preallocated sense buffer
      ide-cd: convert to using generic sense request
      ide: add helpers for preparing sense requests
      ide-cd: don't abuse rq->buffer
      ide-atapi: don't abuse rq->buffer
      ...
    27951daa