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, 26 insertions, 24 deletions

diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c
index 4fc7ccc0a2cf..b4ed8b36e078 100644
--- a/arch/openrisc/kernel/setup.c
+++ b/arch/openrisc/kernel/setup.c
@@ -329,30 +329,32 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         version = (vr & SPR_VR_VER) >> 24;
         revision = vr & SPR_VR_REV;
 
-        return seq_printf(m,
-                          "cpu\t\t: OpenRISC-%x\n"
-                          "revision\t: %d\n"
-                          "frequency\t: %ld\n"
-                          "dcache size\t: %d bytes\n"
-                          "dcache block size\t: %d bytes\n"
-                          "icache size\t: %d bytes\n"
-                          "icache block size\t: %d bytes\n"
-                          "immu\t\t: %d entries, %lu ways\n"
-                          "dmmu\t\t: %d entries, %lu ways\n"
-                          "bogomips\t: %lu.%02lu\n",
-                          version,
-                          revision,
-                          loops_per_jiffy * HZ,
-                          cpuinfo.dcache_size,
-                          cpuinfo.dcache_block_size,
-                          cpuinfo.icache_size,
-                          cpuinfo.icache_block_size,
-                          1 << ((mfspr(SPR_DMMUCFGR) & SPR_DMMUCFGR_NTS) >> 2),
-                          1 + (mfspr(SPR_DMMUCFGR) & SPR_DMMUCFGR_NTW),
-                          1 << ((mfspr(SPR_IMMUCFGR) & SPR_IMMUCFGR_NTS) >> 2),
-                          1 + (mfspr(SPR_IMMUCFGR) & SPR_IMMUCFGR_NTW),
-                          (loops_per_jiffy * HZ) / 500000,
-                          ((loops_per_jiffy * HZ) / 5000) % 100);
+        seq_printf(m,
+                   "cpu\t\t: OpenRISC-%x\n"
+                   "revision\t: %d\n"
+                   "frequency\t: %ld\n"
+                   "dcache size\t: %d bytes\n"
+                   "dcache block size\t: %d bytes\n"
+                   "icache size\t: %d bytes\n"
+                   "icache block size\t: %d bytes\n"
+                   "immu\t\t: %d entries, %lu ways\n"
+                   "dmmu\t\t: %d entries, %lu ways\n"
+                   "bogomips\t: %lu.%02lu\n",
+                   version,
+                   revision,
+                   loops_per_jiffy * HZ,
+                   cpuinfo.dcache_size,
+                   cpuinfo.dcache_block_size,
+                   cpuinfo.icache_size,
+                   cpuinfo.icache_block_size,
+                   1 << ((mfspr(SPR_DMMUCFGR) & SPR_DMMUCFGR_NTS) >> 2),
+                   1 + (mfspr(SPR_DMMUCFGR) & SPR_DMMUCFGR_NTW),
+                   1 << ((mfspr(SPR_IMMUCFGR) & SPR_IMMUCFGR_NTS) >> 2),
+                   1 + (mfspr(SPR_IMMUCFGR) & SPR_IMMUCFGR_NTW),
+                   (loops_per_jiffy * HZ) / 500000,
+                   ((loops_per_jiffy * HZ) / 5000) % 100);
+
+        return 0;
 }
 
 static void *c_start(struct seq_file *m, loff_t * pos)