Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 3 Oct 2006 21:32:06 +0000 (14:32 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 3 Oct 2006 21:32:06 +0000 (14:32 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()


Trivial merge