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)
commitf3c87a8999c28f2948ebd407574f7e9fb5c577b2
tree658579ea5dc5de036b8b66c1a6fc9ea683481dba
parent2fee7b18453d6a7e9ee2db0c7f7eec30f6898166
parentf311896a990a0b766e279defe9adff29160ada03
Merge /linux/kernel/git/wim/linux-2.6-watchdog

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()