tree 658579ea5dc5de036b8b66c1a6fc9ea683481dba
parent 2fee7b18453d6a7e9ee2db0c7f7eec30f6898166
parent f311896a990a0b766e279defe9adff29160ada03
author Linus Torvalds <torvalds@g5.osdl.org> 1159911126 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1159911126 -0700

Merge master.kernel.org:/pub/scm/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()