Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
  trivial: Update my email address
  trivial: NULL noise: drivers/mtd/tests/mtd_*test.c
  trivial: NULL noise: drivers/media/dvb/frontends/drx397xD_fw.h
  trivial: Fix misspelling of "Celsius".
  trivial: remove unused variable 'path' in alloc_file()
  trivial: fix a pdlfush -> pdflush typo in comment
  trivial: jbd header comment typo fix for JBD_PARANOID_IOFAIL
  trivial: wusb: Storage class should be before const qualifier
  trivial: drivers/char/bsr.c: Storage class should be before const qualifier
  trivial: h8300: Storage class should be before const qualifier
  trivial: fix where cgroup documentation is not correctly referred to
  trivial: Give the right path in Documentation example
  trivial: MTD: remove EOL from MODULE_DESCRIPTION
  trivial: Fix typo in bio_split()'s documentation
  trivial: PWM: fix of #endif comment
  trivial: fix typos/grammar errors in Kconfig texts
  trivial: Fix misspelling of firmware
  trivial: cgroups: documentation typo and spelling corrections
  trivial: Update contact info for Jochen Hein
  trivial: fix typo "resgister" -> "register"
  ...

3 files changed, 14 insertions, 14 deletions

diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c
index e4226e02d63e..e51c1ed7ac18 100644
--- a/drivers/mtd/nand/diskonchip.c
+++ b/drivers/mtd/nand/diskonchip.c
@@ -1773,4 +1773,4 @@ module_exit(cleanup_nanddoc);
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("David Woodhouse <dwmw2@infradead.org>");
-MODULE_DESCRIPTION("M-Systems DiskOnChip 2000, Millennium and Millennium Plus device driver\n");
+MODULE_DESCRIPTION("M-Systems DiskOnChip 2000, Millennium and Millennium Plus device driver");
diff --git a/drivers/mtd/tests/mtd_oobtest.c b/drivers/mtd/tests/mtd_oobtest.c
index afbc3f8126db..a18e8d2f2557 100644
--- a/drivers/mtd/tests/mtd_oobtest.c
+++ b/drivers/mtd/tests/mtd_oobtest.c
@@ -136,7 +136,7 @@ static int write_eraseblock(int ebnum)
                 ops.ooblen    = use_len;
                 ops.oobretlen = 0;
                 ops.ooboffs   = use_offset;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = writebuf;
                 err = mtd->write_oob(mtd, addr, &ops);
                 if (err || ops.oobretlen != use_len) {
@@ -189,7 +189,7 @@ static int verify_eraseblock(int ebnum)
                 ops.ooblen    = use_len;
                 ops.oobretlen = 0;
                 ops.ooboffs   = use_offset;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = readbuf;
                 err = mtd->read_oob(mtd, addr, &ops);
                 if (err || ops.oobretlen != use_len) {
@@ -216,7 +216,7 @@ static int verify_eraseblock(int ebnum)
                         ops.ooblen    = mtd->ecclayout->oobavail;
                         ops.oobretlen = 0;
                         ops.ooboffs   = 0;
-                        ops.datbuf    = 0;
+                        ops.datbuf    = NULL;
                         ops.oobbuf    = readbuf;
                         err = mtd->read_oob(mtd, addr, &ops);
                         if (err || ops.oobretlen != mtd->ecclayout->oobavail) {
@@ -281,7 +281,7 @@ static int verify_eraseblock_in_one_go(int ebnum)
         ops.ooblen    = len;
         ops.oobretlen = 0;
         ops.ooboffs   = 0;
-        ops.datbuf    = 0;
+        ops.datbuf    = NULL;
         ops.oobbuf    = readbuf;
         err = mtd->read_oob(mtd, addr, &ops);
         if (err || ops.oobretlen != len) {
@@ -522,7 +522,7 @@ static int __init mtd_oobtest_init(void)
         ops.ooblen    = 1;
         ops.oobretlen = 0;
         ops.ooboffs   = mtd->ecclayout->oobavail;
-        ops.datbuf    = 0;
+        ops.datbuf    = NULL;
         ops.oobbuf    = writebuf;
         printk(PRINT_PREF "attempting to start write past end of OOB\n");
         printk(PRINT_PREF "an error is expected...\n");
@@ -542,7 +542,7 @@ static int __init mtd_oobtest_init(void)
         ops.ooblen    = 1;
         ops.oobretlen = 0;
         ops.ooboffs   = mtd->ecclayout->oobavail;
-        ops.datbuf    = 0;
+        ops.datbuf    = NULL;
         ops.oobbuf    = readbuf;
         printk(PRINT_PREF "attempting to start read past end of OOB\n");
         printk(PRINT_PREF "an error is expected...\n");
@@ -566,7 +566,7 @@ static int __init mtd_oobtest_init(void)
                 ops.ooblen    = mtd->ecclayout->oobavail + 1;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 0;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = writebuf;
                 printk(PRINT_PREF "attempting to write past end of device\n");
                 printk(PRINT_PREF "an error is expected...\n");
@@ -586,7 +586,7 @@ static int __init mtd_oobtest_init(void)
                 ops.ooblen    = mtd->ecclayout->oobavail + 1;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 0;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = readbuf;
                 printk(PRINT_PREF "attempting to read past end of device\n");
                 printk(PRINT_PREF "an error is expected...\n");
@@ -610,7 +610,7 @@ static int __init mtd_oobtest_init(void)
                 ops.ooblen    = mtd->ecclayout->oobavail;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 1;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = writebuf;
                 printk(PRINT_PREF "attempting to write past end of device\n");
                 printk(PRINT_PREF "an error is expected...\n");
@@ -630,7 +630,7 @@ static int __init mtd_oobtest_init(void)
                 ops.ooblen    = mtd->ecclayout->oobavail;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 1;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = readbuf;
                 printk(PRINT_PREF "attempting to read past end of device\n");
                 printk(PRINT_PREF "an error is expected...\n");
@@ -670,7 +670,7 @@ static int __init mtd_oobtest_init(void)
                         ops.ooblen    = sz;
                         ops.oobretlen = 0;
                         ops.ooboffs   = 0;
-                        ops.datbuf    = 0;
+                        ops.datbuf    = NULL;
                         ops.oobbuf    = writebuf;
                         err = mtd->write_oob(mtd, addr, &ops);
                         if (err)
@@ -698,7 +698,7 @@ static int __init mtd_oobtest_init(void)
                 ops.ooblen    = mtd->ecclayout->oobavail * 2;
                 ops.oobretlen = 0;
                 ops.ooboffs   = 0;
-                ops.datbuf    = 0;
+                ops.datbuf    = NULL;
                 ops.oobbuf    = readbuf;
                 err = mtd->read_oob(mtd, addr, &ops);
                 if (err)
diff --git a/drivers/mtd/tests/mtd_readtest.c b/drivers/mtd/tests/mtd_readtest.c
index 645e77fdc63d..79fc4530987b 100644
--- a/drivers/mtd/tests/mtd_readtest.c
+++ b/drivers/mtd/tests/mtd_readtest.c
@@ -71,7 +71,7 @@ static int read_eraseblock_by_page(int ebnum)
                         ops.ooblen    = mtd->oobsize;
                         ops.oobretlen = 0;
                         ops.ooboffs   = 0;
-                        ops.datbuf    = 0;
+                        ops.datbuf    = NULL;
                         ops.oobbuf    = oobbuf;
                         ret = mtd->read_oob(mtd, addr, &ops);
                         if (ret || ops.oobretlen != mtd->oobsize) {