Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 22:24:35 +0000 (15:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Apr 2009 22:24:35 +0000 (15:24 -0700)
commit811158b147a503fbdf9773224004ffd32002d1fe
tree0a11dcfefe721bfc38ea9f1f4a238822dbae0dda
parent4e76c5ccd5ac9bd003467d3bb0f49b18572dd4cd
parentb26e0ed4936b743b693a4cc1413561fa3e4eaf65
Merge branch 'for-linus' of git://git./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"
  ...
26 files changed:
CREDITS
Documentation/cgroups/cgroups.txt
Documentation/cgroups/memcg_test.txt
Documentation/kernel-parameters.txt
MAINTAINERS
arch/h8300/kernel/timer/tpu.c
arch/mips/Kconfig
arch/powerpc/Kconfig
arch/powerpc/platforms/Kconfig
arch/x86/Kconfig
drivers/acpi/thermal.c
drivers/base/sys.c
drivers/media/common/tuners/Kconfig
drivers/media/dvb/frontends/Kconfig
drivers/misc/Kconfig
drivers/net/tg3.c
drivers/net/wireless/ipw2x00/ipw2200.c
drivers/pci/pci.c
drivers/platform/x86/thinkpad_acpi.c
fs/fs-writeback.c
include/linux/cgroup.h
include/linux/jbd.h
init/Kconfig
kernel/power/disk.c
mm/page_alloc.c
net/sunrpc/Kconfig