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

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 05fe3053dcae..414a8ad97f52 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -127,13 +127,13 @@ config BOARD_HAMMERHEAD
         select CPU_AT32AP7000
         select USB_ARCH_HAS_HCD
         help
-          The Hammerhead platform is built around a AVR32 32-bit microcontroller from Atmel.
+          The Hammerhead platform is built around an AVR32 32-bit microcontroller from Atmel.
           It offers versatile peripherals, such as ethernet, usb device, usb host etc.
 
-          The board also incooperates a power supply and is a Power over Ethernet (PoE) Powered
+          The board also incorporates a power supply and is a Power over Ethernet (PoE) Powered
           Device (PD).
 
-          Additonally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is
+          Additionally, a Cyclone III FPGA from Altera is integrated on the board. The FPGA is
           mapped into the 32-bit AVR memory bus. The FPGA offers two DDR2 SDRAM interfaces, which
           will cover even the most exceptional need of memory bandwidth. Together with the onboard
           video decoder the board is ready for video processing.