Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into ppc970.osdl.org:/home/torvalds/v2.6/linux

diff --cc drivers/char/watchdog/wdt977.c
index 2b7ce1f80596f0d76d67a0335a9efc6ce1a26851,cead80f216b29ca9db38bd33a417b364338b6536..388c548c255b3cc848cb1823668464c9b71c0991
--- 1/drivers/char/watchdog/wdt977.c
--- 2/drivers/char/watchdog/wdt977.c
+++ b/drivers/char/watchdog/wdt977.c
@@@ -273,8 -273,13 +273,9 @@@ static int wdt977_release(struct inode 
   *      write of data will do, as we we don't define content meaning.
   */
  
- static ssize_t wdt977_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
+ static ssize_t wdt977_write(struct file *file, const char __user *buf,
+                           size_t count, loff_t *ppos)
  {
 -      /* Can't seek (pwrite) on this device  */
 -      if (ppos != &file->f_pos)
 -              return -ESPIPE;
 -
        if (count) {
                if (!nowayout) {
                        size_t i;