Merge branch 'akpm' (patches from Andrew)

Merge second patchbomb from Andrew Morton:

 - the rest of MM

 - various misc bits

 - add ability to run /sbin/reboot at reboot time

 - printk/vsprintf changes

 - fiddle with seq_printf() return value

* akpm: (114 commits)
  parisc: remove use of seq_printf return value
  lru_cache: remove use of seq_printf return value
  tracing: remove use of seq_printf return value
  cgroup: remove use of seq_printf return value
  proc: remove use of seq_printf return value
  s390: remove use of seq_printf return value
  cris fasttimer: remove use of seq_printf return value
  cris: remove use of seq_printf return value
  openrisc: remove use of seq_printf return value
  ARM: plat-pxa: remove use of seq_printf return value
  nios2: cpuinfo: remove use of seq_printf return value
  microblaze: mb: remove use of seq_printf return value
  ipc: remove use of seq_printf return value
  rtc: remove use of seq_printf return value
  power: wakeup: remove use of seq_printf return value
  x86: mtrr: if: remove use of seq_printf return value
  linux/bitmap.h: improve BITMAP_{LAST,FIRST}_WORD_MASK
  MAINTAINERS: CREDITS: remove Stefano Brivio from B43
  .mailmap: add Ricardo Ribalda
  CREDITS: add Ricardo Ribalda Delgado
  ...

1 files changed, 9 insertions, 7 deletions

diff --git a/drivers/rtc/rtc-mrst.c b/drivers/rtc/rtc-mrst.c
index 3a6fd3a8a2ec..548ea6f6f384 100644
--- a/drivers/rtc/rtc-mrst.c
+++ b/drivers/rtc/rtc-mrst.c
@@ -277,13 +277,15 @@ static int mrst_procfs(struct device *dev, struct seq_file *seq)
         valid = vrtc_cmos_read(RTC_VALID);
         spin_unlock_irq(&rtc_lock);
 
-        return seq_printf(seq,
-                        "periodic_IRQ\t: %s\n"
-                        "alarm\t\t: %s\n"
-                        "BCD\t\t: no\n"
-                        "periodic_freq\t: daily (not adjustable)\n",
-                        (rtc_control & RTC_PIE) ? "on" : "off",
-                        (rtc_control & RTC_AIE) ? "on" : "off");
+        seq_printf(seq,
+                   "periodic_IRQ\t: %s\n"
+                   "alarm\t\t: %s\n"
+                   "BCD\t\t: no\n"
+                   "periodic_freq\t: daily (not adjustable)\n",
+                   (rtc_control & RTC_PIE) ? "on" : "off",
+                   (rtc_control & RTC_AIE) ? "on" : "off");
+
+        return 0;
 }
 
 #else