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"
  ...

diff --cc CREDITS
Simple merge

diff --cc Documentation/cgroups/cgroups.txt
Simple merge

diff --cc Documentation/cgroups/memcg_test.txt
Simple merge

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/h8300/kernel/timer/tpu.c
index ad383caae196c282583d57e54d6e467dca9fcc62,79ae1db9ea90218168234958cc5f5a2b4e9d3658..e7c6e614a758b6ea05380d393476a49b82ea8bc0
--- 1/arch/h8300/kernel/timer/tpu.c
--- 2/arch/h8300/kernel/timer/tpu.c
+++ b/arch/h8300/kernel/timer/tpu.c
@@@ -65,9 -65,10 +65,9 @@@ static struct irqaction tpu_irq = 
        .name           = "tpu",
        .handler        = timer_interrupt,
        .flags          = IRQF_DISABLED | IRQF_TIMER,
 -      .mask           = CPU_MASK_NONE,
  };
  
- const static int __initdata divide_rate[] = {
+ static const int __initdata divide_rate[] = {
  #if CONFIG_H8300_TPU_CH == 0
        1,4,16,64,0,0,0,0,
  #elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5)

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc drivers/acpi/thermal.c
Simple merge

diff --cc drivers/base/sys.c
Simple merge

diff --cc drivers/media/common/tuners/Kconfig
index 52c3f65b12d69362b79c8b386cf0d59c3e04bb02,da058c174049a80206c4fceff2d6d9b7fe09b0ec..607d319ce8ed8fd09a512770a3658a9206fcb453
--- 1/drivers/media/common/tuners/Kconfig
--- 2/drivers/media/common/tuners/Kconfig
+++ b/drivers/media/common/tuners/Kconfig
@@@ -145,10 -144,10 +145,10 @@@ config MEDIA_TUNER_XC202
  config MEDIA_TUNER_XC5000
        tristate "Xceive XC5000 silicon tuner"
        depends on VIDEO_MEDIA && I2C
 -      default m if DVB_FE_CUSTOMISE
 +      default m if MEDIA_TUNER_CUSTOMISE
        help
          A driver for the silicon tuner XC5000 from Xceive.
-         This device is only used inside a SiP called togther with a
+         This device is only used inside a SiP called together with a
          demodulator for now.
  
  config MEDIA_TUNER_MXL5005S

diff --cc drivers/media/dvb/frontends/Kconfig
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/net/tg3.c
Simple merge

diff --cc drivers/net/wireless/ipw2x00/ipw2200.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/platform/x86/thinkpad_acpi.c
Simple merge

diff --cc fs/fs-writeback.c
Simple merge

diff --cc include/linux/cgroup.h
index 4316a546beb51a201394b1eb8c97a51c8eea2c0a,b837631fe49938e518ec14846878f497901cdc00..665fa70e4094166c76b85176f0fbb3f5f6fae7c5
--- 1/include/linux/cgroup.h
--- 2/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@@ -362,10 -339,13 +362,13 @@@ int cgroup_path(const struct cgroup *cg
  
  int cgroup_task_count(const struct cgroup *cgrp);
  
 -/* Return true if the cgroup is a descendant of the current cgroup */
 -int cgroup_is_descendant(const struct cgroup *cgrp);
 +/* Return true if cgrp is a descendant of the task's cgroup */
 +int cgroup_is_descendant(const struct cgroup *cgrp, struct task_struct *task);
  
- /* Control Group subsystem type. See Documentation/cgroups.txt for details */
+ /*
+  * Control Group subsystem type.
+  * See Documentation/cgroups/cgroups.txt for details
+  */
  
  struct cgroup_subsys {
        struct cgroup_subsys_state *(*create)(struct cgroup_subsys *ss,

diff --cc include/linux/jbd.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/power/disk.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/sunrpc/Kconfig
Simple merge