1. 18 Jul, 2007 36 commits
  2. 17 Jul, 2007 4 commits
    • Linus Torvalds's avatar
      Revert drivers/ide/ide.c scsi_cmd_ioctl() usage changes · 1985026d
      Linus Torvalds authored
      The old IDE driver is not ready to take generic SCSI commands, even if
      it uses them for some specific issues (ie the tray open/close ioctls for
      IDE CD-ROM's). Pointed out by Bartlomiej.
      
      I'm sure we'll have it fixed properly soon enough, but for now we should
      not allow it to cause problems.
      
      Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      Cc: Jens Axboe <jens.axboe@oracle.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1985026d
    • Linus Torvalds's avatar
      Make the "z/VM unit record device driver" depend on S390 · 8b0d4164
      Linus Torvalds authored
      I really don't see anybody else wanting to select it ;)
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8b0d4164
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · fd2f2610
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] Fix broken logic, SIGA flags must be bitwise ORed
        [S390] cio: Dont print trailing \0 in modalias_show().
        [S390] Simplify stack trace.
        [S390] z/VM unit record device driver
        [S390] vmcp cleanup
        [S390] qdio: output queue stall on FCP and network devices
        [S390] Fix disassembly of RX_URRD, SI_URD & PC-relative instructions.
        [S390] Update default configuration.
      fd2f2610
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 99e1221d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (21 commits)
        [WATCHDOG] at32ap700x_wdt.c - Fix compilation warnings
        [WATCHDOG] at32ap700x_wdt.c - Add spinlock support
        [WATCHDOG] at32ap700x_wdt.c - Add nowayout + MAGICCLOSE features
        [WATCHDOG] at32ap700x_wdt.c - timeout module parameter patch
        [WATCHDOG] at32ap700x_wdt.c - checkpatch.pl-0.05 clean-up's
        [WATCHDOG] change s3c2410_wdt to using dev_() macros for output
        [WATCHDOG] s3c2410_wdt announce initialisation
        [WATCHDOG] at32ap700x-wdt: add iounmap if probe function fails
        [WATCHDOG] at32ap700x-wdt: add missing iounmap in _remove
        [WATCHDOG] watchdog-driver-for-at32ap700x-devices-fix-2
        [WATCHDOG] watchdog-driver-for-at32ap700x-devices-fix
        [WATCHDOG] Watchdog driver for AT32AP700X devices
        [WATCHDOG] Mixcom Watchdog - CodingStyle clean-up
        [WATCHDOG] Mixcom Watchdog - clean-up printk's
        [WATCHDOG] Mixcom Watchdog - clean-up printk's
        [WATCHDOG] Mixcom Watchdog - checkcard part 2
        [WATCHDOG] Mixcom Watchdog - checkcard
        [WATCHDOG] Mixcom Watchdog - get rid of port offset's
        [WATCHDOG] Mixcom Watchdog - update "Documentation"
        [WATCHDOG] Remove the redundant check for pwrite() in EP93XXX watchdog.
        ...
      99e1221d