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, 19 insertions, 17 deletions

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index 5b2e76159b41..87647f459198 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -459,23 +459,25 @@ static int cmos_procfs(struct device *dev, struct seq_file *seq)
         /* NOTE:  at least ICH6 reports battery status using a different
          * (non-RTC) bit; and SQWE is ignored on many current systems.
          */
-        return seq_printf(seq,
-                        "periodic_IRQ\t: %s\n"
-                        "update_IRQ\t: %s\n"
-                        "HPET_emulated\t: %s\n"
-                        // "square_wave\t: %s\n"
-                        "BCD\t\t: %s\n"
-                        "DST_enable\t: %s\n"
-                        "periodic_freq\t: %d\n"
-                        "batt_status\t: %s\n",
-                        (rtc_control & RTC_PIE) ? "yes" : "no",
-                        (rtc_control & RTC_UIE) ? "yes" : "no",
-                        is_hpet_enabled() ? "yes" : "no",
-                        // (rtc_control & RTC_SQWE) ? "yes" : "no",
-                        (rtc_control & RTC_DM_BINARY) ? "no" : "yes",
-                        (rtc_control & RTC_DST_EN) ? "yes" : "no",
-                        cmos->rtc->irq_freq,
-                        (valid & RTC_VRT) ? "okay" : "dead");
+        seq_printf(seq,
+                   "periodic_IRQ\t: %s\n"
+                   "update_IRQ\t: %s\n"
+                   "HPET_emulated\t: %s\n"
+                   // "square_wave\t: %s\n"
+                   "BCD\t\t: %s\n"
+                   "DST_enable\t: %s\n"
+                   "periodic_freq\t: %d\n"
+                   "batt_status\t: %s\n",
+                   (rtc_control & RTC_PIE) ? "yes" : "no",
+                   (rtc_control & RTC_UIE) ? "yes" : "no",
+                   is_hpet_enabled() ? "yes" : "no",
+                   // (rtc_control & RTC_SQWE) ? "yes" : "no",
+                   (rtc_control & RTC_DM_BINARY) ? "no" : "yes",
+                   (rtc_control & RTC_DST_EN) ? "yes" : "no",
+                   cmos->rtc->irq_freq,
+                   (valid & RTC_VRT) ? "okay" : "dead");
+
+        return 0;
 }
 
 #else