From: Linus Torvalds Date: Tue, 3 Oct 2006 21:32:06 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f3c87a8999c28f2948ebd407574f7e9fb5c577b2;p=linux-beck.git 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() --- f3c87a8999c28f2948ebd407574f7e9fb5c577b2