Manual merge

diff --cc drivers/char/watchdog/wdt977.c
index 49925dadfe55ca0f7c78b45a3f98d051f9f64393,06d10f1d79a63a21563af9c72cf50c3f8a0d328d..80a4a7daebb6534356f52fe730c1a8a9b2110be1
--- 1/drivers/char/watchdog/wdt977.c
--- 2/drivers/char/watchdog/wdt977.c
+++ b/drivers/char/watchdog/wdt977.c
@@@ -254,14 -252,16 +252,15 @@@ static ssize_t wdt977_write(struct fil
   *      according to their available features.
   */
  
- static int wdt977_ioctl(struct inode *inode, struct file *file,
-          unsigned int cmd, unsigned long arg)
- {
  static struct watchdog_info ident = {
-       .identity = "Winbond 83977"
+       .options        = WDIOF_SETTIMEOUT,
+       .identity       = "Winbond 83977"
  };
  
- int temp;
+ static int wdt977_ioctl(struct inode *inode, struct file *file,
+          unsigned int cmd, unsigned long arg)
+ {
 -
+       int temp;
  
        switch(cmd)
        {

diff --cc drivers/input/serio/sa1111ps2.c
Simple merge