]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit35da2666fd611ceb80bc310fdb51a0b540fba0b9
tree658579ea5dc5de036b8b66c1a6fc9ea683481dba
parentdad9e50b249561d9b010811e754c6b0c9344a300
parent1a8b41c76bb54c9421ac8c3d7318d8a8a4ffed5e
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()