Merge gregkh@master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
commitca412cc992c3226239dd3bf896681bbf30e1b444
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 16 Aug 2006 08:38:39 +0000 (16 01:38 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 16 Aug 2006 08:38:39 +0000 (16 01:38 -0700)
tree5b5fd9becdfeda652173ada495b7738988211c7b
parente0e92632715f08dddeddb72b76e04c20126e1f67
parent2621e2a155140b01c6ff57b3863cda2922c2c8bd
Merge gregkh@/linux/kernel/git/wim/linux-2.6-watchdog