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 · e6423407
    Linus Torvalds authored
    * 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (34 commits)
      ide-cd: prevent null pointer deref via cdrom_newpc_intr
      ide: BUG() on unknown requests
      ide: filter out invalid DMA xfer mode changes in HDIO_DRIVE_CMD ioctl handler
      ide: do not access ide_drive_t 'drive_data' field directly
      sl82c105: implement test_irq() method
      siimage: implement test_irq() method
      pdc202xx_old: implement test_irq() method (take 2)
      cmd64x: implement test_irq() method
      cmd640: implement test_irq() method
      ide: move ack_intr() method into 'struct ide_port_ops' (take 2)
      ide: move IRQ clearing from ack_intr() method to clear_irq() method (take 2)
      siimage: use ide_dma_test_irq() (take 2)
      cmd64x: implement clear_irq() method (take 2)
      ide: call clear_irq() method in ide_timer_expiry()
      sgiioc4: coding style cleanup
      ide: don't enable IORDY at a probe time
      ide: IORDY handling fixes
      ata: add ata_id_pio_need_iordy() helper (v2)
      ide-tape: fix build issue
      ide: unify interrupt reason checking
      ...
    e6423407