1. 20 Jul, 2007 38 commits
  2. 19 Jul, 2007 2 commits
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 · 64fb98fc
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (23 commits)
        ide: add support for SCSI ioctls to ide-floppy
        ide: remove stale changelog from setup-pci.c
        ide: remove stale changelog/comments/TODO from ide.c
        ide-cris: handle PIO auto-tuning in tune_cris_ide()
        ide: add PIO masks
        ide: remove ide_find_best_pio_mode()
        ide: drop "PIO data" argument from ide_get_best_pio_mode()
        ide: ide_find_best_pio_mode() fixes (take 2)
        ide: add ide_pio_cycle_time() helper (take 2)
        sc1200: remove stale Power Management code
        ide: ide_start_power_step() fix WRT disabling DMA
        serverworks: fix DMA
        serverworks: always tune PIO
        ide: add ide_pci_device_t.host_flags (take 2)
        ide: add ide_dev_has_iordy() helper (take 4)
        ide: make ide_get_best_pio_mode() print info if overriding PIO mode
        siimage: PIO mode setup fixes (take 2)
        atiixp: PIO mode setup fixes
        ide: Stop mapping ROMs
        IDE: Remove references to dead ETRAX-related variables.
        ...
      64fb98fc
    • Al Viro's avatar
      coda breakage · 5f47c7ea
      Al Viro authored
      	a) switch by loff_t == __cmpdi2 use.  Replaced with a couple
      of obvious ifs; update of ->f_pos in the first one makes sure that we
      do the right thing in all cases.
      	b) block_signals() and unblock_signals() are globals on UML.
      Renamed coda ones; in principle UML probably ought to do rename as
      well, but that's another story.
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5f47c7ea