176 files changed, 266 insertions, 386 deletions
diff --git a/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff b/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
index 9aec8ef228b0..167d9032b970 100644
--- a/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
+++ b/Documentation/ABI/testing/sysfs-driver-hid-logitech-lg4ff
@@ -1,7 +1,7 @@
 What:           /sys/module/hid_logitech/drivers/hid:logitech/<dev>/range.
 Date:           July 2011
 KernelVersion:  3.2
-Contact:        Michal Mal� <madcatxster@gmail.com>
+Contact:        Michal Malý <madcatxster@gmail.com>
 Description:    Display minimum, maximum and current range of the steering
                wheel. Writing a value within min and max boundaries sets the
                range of the wheel.
diff --git a/Documentation/cpu-freq/governors.txt b/Documentation/cpu-freq/governors.txt
index d221781dabaa..c7a2eb8450c2 100644
--- a/Documentation/cpu-freq/governors.txt
+++ b/Documentation/cpu-freq/governors.txt
@@ -127,7 +127,7 @@ in the bash (as said, 1000 is default), do:
 echo `$(($(cat cpuinfo_transition_latency) * 750 / 1000)) \
    >ondemand/sampling_rate
-show_sampling_rate_min:
+sampling_rate_min:
 The sampling rate is limited by the HW transition latency:
 transition_latency * 100
 Or by kernel restrictions:
@@ -140,8 +140,6 @@ HZ=100:  min=200000us (200ms)
 The highest value of kernel and HW latency restrictions is shown and
 used as the minimum sampling rate.
-show_sampling_rate_max: THIS INTERFACE IS DEPRECATED, DON'T USE IT.
 up_threshold: defines what the average CPU usage between the samplings
 of 'sampling_rate' needs to be for the kernel to make a decision on
 whether it should increase the frequency.  For example when it is set
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
index eccffe715229..cec8864ce4e8 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -379,7 +379,7 @@ Your cooperation is appreciated.
                162 = /dev/smbus        System Management Bus
                163 = /dev/lik          Logitech Internet Keyboard
                164 = /dev/ipmo         Intel Intelligent Platform Management
-                165 = /dev/vmmon        VMWare virtual machine monitor
+                165 = /dev/vmmon        VMware virtual machine monitor
                166 = /dev/i2o/ctl      I2O configuration manager
                167 = /dev/specialix_sxctl Specialix serial control
                168 = /dev/tcldrv       Technology Concepts serial control
diff --git a/Documentation/scsi/53c700.txt b/Documentation/scsi/53c700.txt
index 0da681d497a2..e31aceb6df15 100644
--- a/Documentation/scsi/53c700.txt
+++ b/Documentation/scsi/53c700.txt
@@ -16,32 +16,13 @@ fill in to get the driver working.
 Compile Time Flags
 ==================
-The driver may be either io mapped or memory mapped.  This is
+A compile time flag is:
-selectable by configuration flags:
-CONFIG_53C700_MEM_MAPPED
-define if the driver is memory mapped.
-CONFIG_53C700_IO_MAPPED
-define if the driver is to be io mapped.
-One or other of the above flags *must* be defined.
-Other flags are:
 CONFIG_53C700_LE_ON_BE
 define if the chipset must be supported in little endian mode on a big
 endian architecture (used for the 700 on parisc).
-CONFIG_53C700_USE_CONSISTENT
-allocate consistent memory (should only be used if your architecture
-has a mixture of consistent and inconsistent memory).  Fully
-consistent or fully inconsistent architectures should not define this.
 Using the Chip Core Driver
 ==========================
diff --git a/Documentation/vgaarbiter.txt b/Documentation/vgaarbiter.txt
index b7d401e0eae9..014423e2824c 100644
--- a/Documentation/vgaarbiter.txt
+++ b/Documentation/vgaarbiter.txt
@@ -177,7 +177,7 @@ II. Credits
 Benjamin Herrenschmidt (IBM?) started this work when he discussed such design
 with the Xorg community in 2005 [1, 2]. In the end of 2007, Paulo Zanoni and
-Tiago Vignatti (both of C3SL/Federal University of Paran�) proceeded his work
+Tiago Vignatti (both of C3SL/Federal University of Paraná) proceeded his work
 enhancing the kernel code to adapt as a kernel module and also did the
 implementation of the user space side [3]. Now (2009) Tiago Vignatti and Dave
 Airlie finally put this work in shape and queued to Jesse Barnes' PCI tree.
diff --git a/MAINTAINERS b/MAINTAINERS
index c00e3cc22352..1e7d90442651 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3182,6 +3182,16 @@ M:	William Irwin <wli@holomorphy.com>
 S:      Maintained
 F:      fs/hugetlbfs/
+Hyper-V CORE AND DRIVERS
+M:      K. Y. Srinivasan <kys@microsoft.com>
+M:      Haiyang Zhang <haiyangz@microsoft.com>
+L:      devel@linuxdriverproject.org
+S:      Maintained
+F:      drivers/hv/
+F:      drivers/hid/hid-hyperv.c
+F:      drivers/net/hyperv/
+F:      drivers/staging/hv/
 I2C/SMBUS STUB DRIVER
 M:      "Mark M. Hoffman" <mhoffman@lightlink.com>
 L:      linux-i2c@vger.kernel.org
@@ -3577,8 +3587,7 @@ F:	net/netfilter/ipvs/
 IPWIRELESS DRIVER
 M:      Jiri Kosina <jkosina@suse.cz>
 M:      David Sterba <dsterba@suse.cz>
-S:      Maintained
+S:      Odd Fixes
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/ipwireless_cs.git
 F:      drivers/tty/ipwireless/
 IPX NETWORK LAYER
@@ -6321,12 +6330,6 @@ M:	David Täht <d@teklibre.com>
 S:      Odd Fixes
 F:      drivers/staging/frontier/
-STAGING - HYPER-V (MICROSOFT)
-M:      Hank Janssen <hjanssen@microsoft.com>
-M:      Haiyang Zhang <haiyangz@microsoft.com>
-S:      Odd Fixes
-F:      drivers/staging/hv/
 STAGING - INDUSTRIAL IO
 M:      Jonathan Cameron <jic23@cam.ac.uk>
 L:      linux-iio@vger.kernel.org
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 444822526a07..f72e1707d463 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1140,10 +1140,9 @@ config IWMMXT
          Enable support for iWMMXt context switching at run time if
          running on a CPU that supports it.
-#  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
 config XSCALE_PMU
        bool
-        depends on CPU_XSCALE && !XSCALE_PMU_TIMER
+        depends on CPU_XSCALE
        default y
 config CPU_HAS_PMU
diff --git a/arch/arm/mach-pxa/colibri-pxa270-income.c b/arch/arm/mach-pxa/colibri-pxa270-income.c
index 80538b8806ed..248804bb2c9d 100644
--- a/arch/arm/mach-pxa/colibri-pxa270-income.c
+++ b/arch/arm/mach-pxa/colibri-pxa270-income.c
@@ -183,7 +183,7 @@ static inline void income_lcd_init(void) {}
 /******************************************************************************
 * Backlight
 ******************************************************************************/
-#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM__MODULE)
+#if defined(CONFIG_BACKLIGHT_PWM) || defined(CONFIG_BACKLIGHT_PWM_MODULE)
 static struct platform_pwm_backlight_data income_backlight_data = {
        .pwm_id         = 0,
        .max_brightness = 0x3ff,
diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h
index 1ab9fd6abe6d..ac44bde5d36d 100644
--- a/arch/arm/plat-omap/include/plat/serial.h
+++ b/arch/arm/plat-omap/include/plat/serial.h
@@ -2,7 +2,7 @@
 * arch/arm/plat-omap/include/mach/serial.h
 *
 * Copyright (C) 2009 Texas Instruments
- * Addded OMAP4 support- Santosh Shilimkar <santosh.shilimkar@ti.com>
+ * Added OMAP4 support- Santosh Shilimkar <santosh.shilimkar@ti.com>
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/arch/cris/Kconfig.debug b/arch/cris/Kconfig.debug
index 0b9a630dc812..14881e81e8a3 100644
--- a/arch/cris/Kconfig.debug
+++ b/arch/cris/Kconfig.debug
@@ -1,6 +1,5 @@
 menu "Kernel hacking"
-#bool 'Debug kmalloc/kfree' CONFIG_DEBUG_MALLOC
 config PROFILING
        bool "Kernel profiling support"
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index bad27a6ff407..c5e69abb4889 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -341,16 +341,6 @@ source "drivers/pci/Kconfig"
 source "drivers/pcmcia/Kconfig"
-#config MATH_EMULATION
-#       bool "Math emulation support (EXPERIMENTAL)"
-#       depends on EXPERIMENTAL
-#       help
-#         At some point in the future, this will cause floating-point math
-#         instructions to be emulated by the kernel on machines that lack a
-#         floating-point math coprocessor.  Thrill-seekers and chronically
-#         sleep-deprived psychotic hacker types can say Y now, everyone else
-#         should probably wait a while.
 menu "Power management options"
 config ARCH_SUSPEND_POSSIBLE
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9c652eb68aaa..a7636d3ddc6a 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -68,7 +68,6 @@ config AR7
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_ZBOOT_UART16550
        select ARCH_REQUIRE_GPIOLIB
-        select GCD
        select VLYNQ
        help
          Support for the Texas Instruments AR7 System-on-a-Chip
@@ -2369,10 +2368,6 @@ config TC
          Linux driver support status is documented at:
          <http://www.linux-mips.org/wiki/DECstation>
-#config ACCESSBUS
-#       bool "Access.Bus support"
-#       depends on TC
 config MMU
        bool
        default y
diff --git a/arch/mips/sgi-ip27/Kconfig b/arch/mips/sgi-ip27/Kconfig
index bc5e9769bb73..4b2ea282b9c7 100644
--- a/arch/mips/sgi-ip27/Kconfig
+++ b/arch/mips/sgi-ip27/Kconfig
@@ -1,9 +1,3 @@
-#config SGI_SN0_XXL
-#       bool "IP27 XXL"
-#       depends on SGI_IP27
-#         This options adds support for userspace processes up to 16TB size.
-#         Normally the limit is just .5TB.
 choice
        prompt "Node addressing mode"
        depends on SGI_IP27
diff --git a/arch/mips/sibyte/Kconfig b/arch/mips/sibyte/Kconfig
index 3e639bda43f7..3cd937e0e9a3 100644
--- a/arch/mips/sibyte/Kconfig
+++ b/arch/mips/sibyte/Kconfig
@@ -71,7 +71,6 @@ config SIBYTE_SB1xxx_SOC
        bool
        select DMA_COHERENT
        select IRQ_CPU
-        select SIBYTE_CFE
        select SWAP_IO_SPACE
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_64BIT_KERNEL
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index 45698d55cd6a..a3855b81eada 100644
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -394,7 +394,7 @@ __do_out_asm(_rec_outl, "stwbrx")
 #endif /* CONFIG_PPC32 */
 /* The "__do_*" operations below provide the actual "base" implementation
- * for each of the defined acccessor. Some of them use the out_* functions
+ * for each of the defined accessors. Some of them use the out_* functions
 * directly, some of them still use EEH, though we might change that in the
 * future. Those macros below provide the necessary argument swapping and
 * handling of the IO base for PIO.
diff --git a/arch/powerpc/include/asm/keylargo.h b/arch/powerpc/include/asm/keylargo.h
index d8520ef121f9..fc195d0b3c34 100644
--- a/arch/powerpc/include/asm/keylargo.h
+++ b/arch/powerpc/include/asm/keylargo.h
@@ -51,7 +51,7 @@
 #define KL_GPIO_SOUND_POWER             (KEYLARGO_GPIO_0+0x05)
-/* Hrm... this one is only to be used on Pismo. It seeem to also
+/* Hrm... this one is only to be used on Pismo. It seems to also
 * control the timebase enable on other machines. Still to be
 * experimented... --BenH.
 */
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index fe92f7007051..4ff3d8e411a7 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -501,7 +501,7 @@ static int of_get_assoc_arrays(struct device_node *memory,
        aa->n_arrays = *prop++;
        aa->array_sz = *prop++;
-        /* Now that we know the number of arrrays and size of each array,
+        /* Now that we know the number of arrays and size of each array,
         * revalidate the size of the property read in.
         */
        if (len < (aa->n_arrays * aa->array_sz + 2) * sizeof(unsigned int))
diff --git a/arch/powerpc/platforms/40x/Kconfig b/arch/powerpc/platforms/40x/Kconfig
index baae85584b1c..a392d12dd21f 100644
--- a/arch/powerpc/platforms/40x/Kconfig
+++ b/arch/powerpc/platforms/40x/Kconfig
@@ -1,19 +1,3 @@
-#config BUBINGA
-#       bool "Bubinga"
-#       depends on 40x
-#       default n
-#       select 405EP
-#       help
-#         This option enables support for the IBM 405EP evaluation board.
-#config CPCI405
-#       bool "CPCI405"
-#       depends on 40x
-#       default n
-#       select 405GP
-#       help
-#         This option enables support for the CPCI405 board.
 config ACADIA
        bool "Acadia"
        depends on 40x
@@ -65,14 +49,6 @@ config MAKALU
        help
          This option enables support for the AMCC PPC405EX board.
-#config SYCAMORE
-#       bool "Sycamore"
-#       depends on 40x
-#       default n
-#       select 405GPR
-#       help
-#         This option enables support for the IBM PPC405GPr evaluation board.
 config WALNUT
        bool "Walnut"
        depends on 40x
@@ -183,21 +159,6 @@ config IBM405_ERR77
 config IBM405_ERR51
        bool
-#config BIOS_FIXUP
-#       bool
-#       depends on BUBINGA || EP405 || SYCAMORE || WALNUT
-#       default y
-#config PPC4xx_DMA
-#       bool "PPC4xx DMA controller support"
-#       depends on 4xx
-#config PPC4xx_EDMA
-#       bool
-#       depends on !STB03xxx && PPC4xx_DMA
-#       default y
-#
 config APM8018X
        bool "APM8018X"
        depends on 40x
@@ -206,4 +167,3 @@ config APM8018X
        help
          This option enables support for the AppliedMicro APM8018X evaluation
          board.
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index 5d5aaf6c91aa..fcf6bf2ceee9 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -75,7 +75,7 @@ config KATMAI
        select PCI
        select PPC4xx_PCI_EXPRESS
        select PCI_MSI
-        select PCC4xx_MSI
+        select PPC4xx_MSI
        help
          This option enables support for the AMCC PPC440SPe evaluation board.
@@ -207,22 +207,6 @@ config ICON
        help
          This option enables support for the AMCC PPC440SPe evaluation board.
-#config LUAN
-#       bool "Luan"
-#       depends on 44x
-#       default n
-#       select 440SP
-#       help
-#         This option enables support for the IBM PPC440SP evaluation board.
-#config OCOTEA
-#       bool "Ocotea"
-#       depends on 44x
-#       default n
-#       select 440GX
-#       help
-#         This option enables support for the IBM PPC440GX evaluation board.
 config XILINX_VIRTEX440_GENERIC_BOARD
        bool "Generic Xilinx Virtex 5 FXT board support"
        depends on 44x
diff --git a/arch/powerpc/platforms/512x/Kconfig b/arch/powerpc/platforms/512x/Kconfig
index b3ebce1aec07..c16999802ecf 100644
--- a/arch/powerpc/platforms/512x/Kconfig
+++ b/arch/powerpc/platforms/512x/Kconfig
@@ -12,7 +12,6 @@ config MPC5121_ADS
        bool "Freescale MPC5121E ADS"
        depends on PPC_MPC512x
        select DEFAULT_UIMAGE
-        select MPC5121_ADS_CPLD
        help
          This option enables support for the MPC5121E ADS board.
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index d48ede334434..28d183c42751 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -87,7 +87,6 @@ config S390
        select HAVE_KERNEL_LZMA
        select HAVE_KERNEL_LZO
        select HAVE_KERNEL_XZ
-        select HAVE_GET_USER_PAGES_FAST
        select HAVE_ARCH_MUTEX_CPU_RELAX
        select HAVE_ARCH_JUMP_LABEL if !MARCH_G5
        select HAVE_RCU_TABLE_FREE if SMP
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 75607724d290..3b1bd7c50164 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -840,7 +840,7 @@ static void tsb_sync(void *info)
        struct trap_per_cpu *tp = &trap_block[raw_smp_processor_id()];
        struct mm_struct *mm = info;
-        /* It is not valid to test "currrent->active_mm == mm" here.
+        /* It is not valid to test "current->active_mm == mm" here.
         *
         * The value of "current" is not changed atomically with
         * switch_mm().  But that's OK, we just need to check the
diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
index db0e9a51e611..da8fe0535ff4 100644
--- a/arch/x86/pci/pcbios.c
+++ b/arch/x86/pci/pcbios.c
@@ -44,7 +44,7 @@ static inline void set_bios_x(void)
        pcibios_enabled = 1;
        set_memory_x(PAGE_OFFSET + BIOS_BEGIN, (BIOS_END - BIOS_BEGIN) >> PAGE_SHIFT);
        if (__supported_pte_mask & _PAGE_NX)
-                printk(KERN_INFO "PCI : PCI BIOS aera is rw and x. Use pci=nobios if you want it NX.\n");
+                printk(KERN_INFO "PCI : PCI BIOS area is rw and x. Use pci=nobios if you want it NX.\n");
 }
 /*
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 527a857d10b6..ae9c3ceb2867 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -329,7 +329,6 @@ config CRYPTO_CRC32C_INTEL
 config CRYPTO_GHASH
        tristate "GHASH digest algorithm"
-        select CRYPTO_SHASH
        select CRYPTO_GF128MUL
        help
          GHASH is message digest algorithm for GCM (Galois/Counter Mode).
@@ -477,7 +476,6 @@ config CRYPTO_WP512
 config CRYPTO_GHASH_CLMUL_NI_INTEL
        tristate "GHASH digest algorithm (CLMUL-NI accelerated)"
        depends on X86 && 64BIT
-        select CRYPTO_SHASH
        select CRYPTO_CRYPTD
        help
          GHASH is message digest algorithm for GCM (Galois/Counter Mode).
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index de0e3df76776..7556913aba45 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -374,7 +374,7 @@ config ACPI_CUSTOM_METHOD
        depends on DEBUG_FS
        default n
        help
-          This debug facility allows ACPI AML methods to me inserted and/or
+          This debug facility allows ACPI AML methods to be inserted and/or
          replaced without rebooting the system. For details refer to:
          Documentation/acpi/method-customizing.txt.
diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
index c2793a82f120..d707756228c2 100644
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
@@ -356,7 +356,7 @@ ACPI_EXPORT_SYMBOL(acpi_read_bit_register)
 *
 * PARAMETERS:  register_id     - ID of ACPI Bit Register to access
 *              Value           - Value to write to the register, in bit
- *                                position zero. The bit is automaticallly
+ *                                position zero. The bit is automatically
 *                                shifted to the correct position.
 *
 * RETURN:      Status
diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index 65cd74832450..524bf96c289f 100644
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -639,7 +639,7 @@ EXPORT_SYMBOL_GPL(devm_kzalloc);
 * @dev: Device this memory belongs to
 * @p: Memory to free
 *
- * Free memory allocated with dev_kzalloc().
+ * Free memory allocated with devm_kzalloc().
 */
 void devm_kfree(struct device *dev, void *p)
 {
diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index f759ad4584c3..8069322e4c9e 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -613,7 +613,7 @@ static void frontend_changed(struct xenbus_device *dev,
        case XenbusStateConnected:
                /*
                 * Ensure we connect even when two watches fire in
-                 * close successsion and we miss the intermediate value
+                 * close succession and we miss the intermediate value
                 * of frontend_state.
                 */
                if (dev->state == XenbusStateConnected)
diff --git a/drivers/char/ipmi/ipmi_bt_sm.c b/drivers/char/ipmi/ipmi_bt_sm.c
index 3ed20e8abc0d..cdd4c09fda96 100644
--- a/drivers/char/ipmi/ipmi_bt_sm.c
+++ b/drivers/char/ipmi/ipmi_bt_sm.c
@@ -560,7 +560,7 @@ static enum si_sm_result bt_event(struct si_sm_data *bt, long time)
                BT_CONTROL(BT_H_BUSY);          /* set */
                /*
-                 * Uncached, ordered writes should just proceeed serially but
+                 * Uncached, ordered writes should just proceed serially but
                 * some BMCs don't clear B2H_ATN with one hit.  Fast-path a
                 * workaround without too much penalty to the general case.
                 */
diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c
index a5da732fe5b2..4184e0171f00 100644
--- a/drivers/edac/i82975x_edac.c
+++ b/drivers/edac/i82975x_edac.c
@@ -277,11 +277,9 @@ static void i82975x_get_error_info(struct mem_ctl_info *mci,
 static int i82975x_process_error_info(struct mem_ctl_info *mci,
                struct i82975x_error_info *info, int handle_errors)
 {
-        int row, multi_chan, chan;
+        int row, chan;
        unsigned long offst, page;
-        multi_chan = mci->csrows[0].nr_channels - 1;
        if (!(info->errsts2 & 0x0003))
                return 0;
@@ -294,20 +292,30 @@ static int i82975x_process_error_info(struct mem_ctl_info *mci,
        }
        page = (unsigned long) info->eap;
-        if (info->xeap & 1)
-                page |= 0x100000000ul;
-        chan = page & 1;
        page >>= 1;
-        offst = page & ((1 << PAGE_SHIFT) - 1);
+        if (info->xeap & 1)
-        page >>= PAGE_SHIFT;
+                page |= 0x80000000;
+        page >>= (PAGE_SHIFT - 1);
        row = edac_mc_find_csrow_by_page(mci, page);
+        if (row == -1)  {
+                i82975x_mc_printk(mci, KERN_ERR, "error processing EAP:\n"
+                        "\tXEAP=%u\n"
+                        "\t EAP=0x%08x\n"
+                        "\tPAGE=0x%08x\n",
+                        (info->xeap & 1) ? 1 : 0, info->eap, (unsigned int) page);
+                return 0;
+        }
+        chan = (mci->csrows[row].nr_channels == 1) ? 0 : info->eap & 1;
+        offst = info->eap
+                        & ((1 << PAGE_SHIFT) -
+                                (1 << mci->csrows[row].grain));
        if (info->errsts & 0x0002)
                edac_mc_handle_ue(mci, page, offst , row, "i82975x UE");
        else
                edac_mc_handle_ce(mci, page, offst, info->derrsyn, row,
-                                multi_chan ? chan : 0,
+                                chan, "i82975x CE");
-                                "i82975x CE");
        return 1;
 }
@@ -410,7 +418,7 @@ static void i82975x_init_csrows(struct mem_ctl_info *mci,
                csrow->last_page = cumul_size - 1;
                csrow->nr_pages = cumul_size - last_cumul_size;
                last_cumul_size = cumul_size;
-                csrow->grain = 1 << 6;  /* I82975X_EAP has 64B resolution */
+                csrow->grain = 1 << 7;  /* 128Byte cache-line resolution */
                csrow->mtype = MEM_DDR2; /* I82975x supports only DDR2 */
                csrow->dtype = i82975x_dram_type(mch_window, index);
                csrow->edac_mode = EDAC_SECDED; /* only supported */
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 38400963e245..fc757069c6af 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -142,7 +142,7 @@
 /*
 * The ibm,sdram-4xx-ddr2 Device Control Registers (DCRs) are
- * indirectly acccessed and have a base and length defined by the
+ * indirectly accessed and have a base and length defined by the
 * device tree. The base can be anything; however, we expect the
 * length to be precisely two registers, the first for the address
 * window and the second for the data window.
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 4e04157a3683..d476880c6fff 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -356,7 +356,7 @@ comment "PCI GPIO expanders:"
 config GPIO_CS5535
        tristate "AMD CS5535/CS5536 GPIO support"
-        depends on PCI && X86 && !CS5535_GPIO && MFD_CS5535
+        depends on PCI && X86 && MFD_CS5535
        help
          The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that
          can be used for quite a number of things.  The CS5535/6 is found on
diff --git a/drivers/gpu/drm/i915/intel_sdvo_regs.h b/drivers/gpu/drm/i915/intel_sdvo_regs.h
index 4aa6f343e49a..6b7b22f4d63e 100644
--- a/drivers/gpu/drm/i915/intel_sdvo_regs.h
+++ b/drivers/gpu/drm/i915/intel_sdvo_regs.h
@@ -1,5 +1,5 @@
 /*
- * Copyright � 2006-2007 Intel Corporation
+ * Copyright �� 2006-2007 Intel Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c
index 070f93a5c11b..47ed74c46b6b 100644
--- a/drivers/hid/hid-pl.c
+++ b/drivers/hid/hid-pl.c
@@ -9,10 +9,10 @@
 *   - contains two reports, one for each port (HID_QUIRK_MULTI_INPUT)
 *
 *  0e8f:0003 "GreenAsia Inc.    USB Joystick     "
- *   - tested with K�nig Gaming gamepad
+ *   - tested with König Gaming gamepad
 *
 *  0e8f:0003 "GASIA USB Gamepad"
- *   - another version of the K�nig gamepad
+ *   - another version of the König gamepad
 *
 *  Copyright (c) 2007, 2009 Anssi Hannula <anssi.hannula@gmail.com>
 */
diff --git a/drivers/hid/hid-twinhan.c b/drivers/hid/hid-twinhan.c
index c40afc57fc8f..f23456b1fd4b 100644
--- a/drivers/hid/hid-twinhan.c
+++ b/drivers/hid/hid-twinhan.c
@@ -3,7 +3,7 @@
 *
 * Based on hid-gyration.c
 *
- * Copyright (c) 2009 Bruno Pr�mont <bonbons@linux-vserver.org>
+ * Copyright (c) 2009 Bruno Prémont <bonbons@linux-vserver.org>
 */
 /*
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 4bb68f35caf2..ac083a28ae08 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -426,7 +426,7 @@ static void xiic_process(struct xiic_i2c *i2c)
                        xiic_wakeup(i2c, STATE_ERROR);
        } else if (pend & (XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK)) {
-                /* Transmit register/FIFO is empty or � empty */
+                /* Transmit register/FIFO is empty or �� empty */
                clr = pend &
                        (XIIC_INTR_TX_EMPTY_MASK | XIIC_INTR_TX_HALF_MASK);
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c
index 26264abf1f58..f55d29d60826 100644
--- a/drivers/isdn/hisax/enternow_pci.c
+++ b/drivers/isdn/hisax/enternow_pci.c
@@ -333,7 +333,7 @@ static void __devinit en_cs_init(struct IsdnCard *card,
        cs->hw.njet.isac = cs->hw.njet.base + 0xC0; // Fenster zum AMD
        /* Reset an */
-        cs->hw.njet.ctrl_reg = 0x07;  // ge�ndert von 0xff
+        cs->hw.njet.ctrl_reg = 0x07;  // geändert von 0xff
        outb(cs->hw.njet.ctrl_reg, cs->hw.njet.base + NETJET_CTRL);
        /* 20 ms Pause */
        mdelay(20);
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index ff203a421863..1b75a56ebd08 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -347,7 +347,8 @@ config LEDS_MC13783
 config LEDS_NS2
        tristate "LED support for Network Space v2 GPIO LEDs"
        depends on LEDS_CLASS
-        depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || MACH_NETSPACE_MAX_V2 || D2NET_V2
+        depends on MACH_NETSPACE_V2 || MACH_INETSPACE_V2 || \
+                   MACH_NETSPACE_MAX_V2 || MACH_D2NET_V2
        default y
        help
          This option enable support for the dual-GPIO LED found on the
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c
index cf10ecf5acec..860c112e0fd2 100644
--- a/drivers/media/rc/ene_ir.c
+++ b/drivers/media/rc/ene_ir.c
@@ -324,7 +324,7 @@ static int ene_rx_get_sample_reg(struct ene_device *dev)
                return dev->extra_buf2_address + r_pointer;
        }
-        dbg("attempt to read beyong ring bufer end");
+        dbg("attempt to read beyond ring buffer end");
        return 0;
 }
diff --git a/drivers/media/rc/ene_ir.h b/drivers/media/rc/ene_ir.h
index fd108d90f750..6f978e85db8c 100644
--- a/drivers/media/rc/ene_ir.h
+++ b/drivers/media/rc/ene_ir.h
@@ -227,7 +227,7 @@ struct ene_device {
        /* TX buffer */
        unsigned *tx_buffer;                    /* input samples buffer*/
-        int tx_pos;                             /* position in that bufer */
+        int tx_pos;                             /* position in that buffer */
        int tx_len;                             /* current len of tx buffer */
        int tx_done;                            /* done transmitting */
                                                /* one more sample pending*/
diff --git a/drivers/media/rc/winbond-cir.c b/drivers/media/rc/winbond-cir.c
index 13f54b51194a..e7f7a57bf684 100644
--- a/drivers/media/rc/winbond-cir.c
+++ b/drivers/media/rc/winbond-cir.c
@@ -1176,6 +1176,6 @@ wbcir_exit(void)
 module_init(wbcir_init);
 module_exit(wbcir_exit);
-MODULE_AUTHOR("David H�rdeman <david@hardeman.nu>");
+MODULE_AUTHOR("David Härdeman <david@hardeman.nu>");
 MODULE_DESCRIPTION("Winbond SuperI/O Consumer IR Driver");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index d4d05d2ace65..f6d26419445e 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1550,7 +1550,7 @@ static int zoran_enum_fmt(struct zoran *zr, struct v4l2_fmtdesc *fmt, int flag)
                if (zoran_formats[i].flags & flag && num++ == fmt->index) {
                        strncpy(fmt->description, zoran_formats[i].name,
                                sizeof(fmt->description) - 1);
-                        /* fmt struct pre-zeroed, so adding '\0' not neeed */
+                        /* fmt struct pre-zeroed, so adding '\0' not needed */
                        fmt->pixelformat = zoran_formats[i].fourcc;
                        if (zoran_formats[i].flags & ZORAN_FORMAT_COMPRESSED)
                                fmt->flags |= V4L2_FMT_FLAG_COMPRESSED;
diff --git a/drivers/message/fusion/lsi/mpi_ioc.h b/drivers/message/fusion/lsi/mpi_ioc.h
index fd6222882a0e..19fb21b8f0ce 100644
--- a/drivers/message/fusion/lsi/mpi_ioc.h
+++ b/drivers/message/fusion/lsi/mpi_ioc.h
@@ -857,7 +857,7 @@ typedef struct _EVENT_DATA_SAS_DISCOVERY
 #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_MASK                  (0xFFFF0000)
 #define MPI_EVENT_SAS_DSCVRY_PHY_BITS_SHIFT                 (16)
-/* SAS Discovery Errror Event data */
+/* SAS Discovery Error Event data */
 typedef struct _EVENT_DATA_DISCOVERY_ERROR
 {
diff --git a/drivers/misc/ibmasm/command.c b/drivers/misc/ibmasm/command.c
index 5c766b4fb238..7d56f45dee19 100644
--- a/drivers/misc/ibmasm/command.c
+++ b/drivers/misc/ibmasm/command.c
@@ -18,7 +18,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/dot_command.c b/drivers/misc/ibmasm/dot_command.c
index 3dd2dfb8da17..d7b2ca358b23 100644
--- a/drivers/misc/ibmasm/dot_command.c
+++ b/drivers/misc/ibmasm/dot_command.c
@@ -17,7 +17,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/dot_command.h b/drivers/misc/ibmasm/dot_command.h
index 6cbba1afef35..fc9fc9d4e087 100644
--- a/drivers/misc/ibmasm/dot_command.h
+++ b/drivers/misc/ibmasm/dot_command.h
@@ -17,7 +17,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c
index 76bfda1ffaa9..8e540f4e9d52 100644
--- a/drivers/misc/ibmasm/event.c
+++ b/drivers/misc/ibmasm/event.c
@@ -18,7 +18,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/heartbeat.c b/drivers/misc/ibmasm/heartbeat.c
index 1bc4306572a4..90746378f9b7 100644
--- a/drivers/misc/ibmasm/heartbeat.c
+++ b/drivers/misc/ibmasm/heartbeat.c
@@ -18,7 +18,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/i2o.h b/drivers/misc/ibmasm/i2o.h
index bf2c738d2b72..2e9566dab2b1 100644
--- a/drivers/misc/ibmasm/i2o.h
+++ b/drivers/misc/ibmasm/i2o.h
@@ -17,7 +17,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h
index 4d8a4e248b34..9b083448814d 100644
--- a/drivers/misc/ibmasm/ibmasm.h
+++ b/drivers/misc/ibmasm/ibmasm.h
@@ -18,7 +18,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c
index 89947723a27d..35361753b487 100644
--- a/drivers/misc/ibmasm/ibmasmfs.c
+++ b/drivers/misc/ibmasm/ibmasmfs.c
@@ -17,7 +17,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/lowlevel.c b/drivers/misc/ibmasm/lowlevel.c
index 4b2398e27fd5..5319ea261c05 100644
--- a/drivers/misc/ibmasm/lowlevel.c
+++ b/drivers/misc/ibmasm/lowlevel.c
@@ -17,7 +17,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/lowlevel.h b/drivers/misc/ibmasm/lowlevel.h
index 766766523a60..e97848f51b3f 100644
--- a/drivers/misc/ibmasm/lowlevel.h
+++ b/drivers/misc/ibmasm/lowlevel.h
@@ -17,7 +17,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c
index a234d965243b..1ccedb71e728 100644
--- a/drivers/misc/ibmasm/module.c
+++ b/drivers/misc/ibmasm/module.c
@@ -18,7 +18,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 * This driver is based on code originally written by Pete Reynolds
 * and others.
diff --git a/drivers/misc/ibmasm/r_heartbeat.c b/drivers/misc/ibmasm/r_heartbeat.c
index 2de487ac788c..232034f5da48 100644
--- a/drivers/misc/ibmasm/r_heartbeat.c
+++ b/drivers/misc/ibmasm/r_heartbeat.c
@@ -16,7 +16,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/misc/ibmasm/remote.h b/drivers/misc/ibmasm/remote.h
index 00dbf1d4373a..a7729ef76acb 100644
--- a/drivers/misc/ibmasm/remote.h
+++ b/drivers/misc/ibmasm/remote.h
@@ -18,7 +18,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 * Originally written by Pete Reynolds
 */
diff --git a/drivers/misc/ibmasm/uart.c b/drivers/misc/ibmasm/uart.c
index 93baa350d698..1dcb9ae1905a 100644
--- a/drivers/misc/ibmasm/uart.c
+++ b/drivers/misc/ibmasm/uart.c
@@ -18,7 +18,7 @@
 *
 * Copyright (C) IBM Corporation, 2004
 *
- * Author: Max Asb�ck <amax@us.ibm.com>
+ * Author: Max Asböck <amax@us.ibm.com>
 *
 */
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 2dba999caf2c..887c0e598cf3 100644
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
@@ -2,7 +2,7 @@
 *  linux/drivers/mmc/host/omap.c
 *
 *  Copyright (C) 2004 Nokia Corporation
- *  Written by Tuukka Tikkanen and Juha Yrj�l�<juha.yrjola@nokia.com>
+ *  Written by Tuukka Tikkanen and Juha Yrjölä<juha.yrjola@nokia.com>
 *  Misc hacks here and there by Tony Lindgren <tony@atomide.com>
 *  Other hacks (DMA, SD, etc) by David Brownell
 *
@@ -1634,4 +1634,4 @@ module_exit(mmc_omap_exit);
 MODULE_DESCRIPTION("OMAP Multimedia Card driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:" DRIVER_NAME);
-MODULE_AUTHOR("Juha Yrj�l�");
+MODULE_AUTHOR("Juha Yrjölä");
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index cce7b70824c3..dd0279249bf4 100644
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -420,7 +420,6 @@ config MTD_NAND_NANDSIM
 config MTD_NAND_GPMI_NAND
        bool "GPMI NAND Flash Controller driver"
        depends on MTD_NAND && (SOC_IMX23 || SOC_IMX28)
-        select MTD_PARTITIONS
        select MTD_CMDLINE_PARTS
        help
         Enables NAND Flash support for IMX23 or IMX28.
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
index c381db23e713..0bd585bba39d 100644
--- a/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/sge.c
@@ -683,7 +683,7 @@ out:
        /*
         * Update our accounting state to incorporate the new Free List
         * buffers, tell the hardware about them and return the number of
-         * bufers which we were able to allocate.
+         * buffers which we were able to allocate.
         */
        cred = fl->avail - cred;
        fl->pend_cred += cred;
diff --git a/drivers/net/ethernet/sis/sis900.h b/drivers/net/ethernet/sis/sis900.h
index 150511a922ef..1341f33e6084 100644
--- a/drivers/net/ethernet/sis/sis900.h
+++ b/drivers/net/ethernet/sis/sis900.h
@@ -205,7 +205,7 @@ enum sis900_tx_buffer_status {
        EXCCOLL = 0x00100000, COLCNT   = 0x000F0000
 };
-enum sis900_rx_bufer_status {
+enum sis900_rx_buffer_status {
        OVERRUN = 0x02000000, DEST = 0x00800000,     BCAST = 0x01800000,
        MCAST   = 0x01000000, UNIMATCH = 0x00800000, TOOLONG = 0x00400000,
        RUNT    = 0x00200000, RXISERR  = 0x00100000, CRCERR  = 0x00080000,
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index b56636da6cc3..2a4f2f153244 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -1664,7 +1664,7 @@ static int nsc_ircc_dma_xmit_complete(struct nsc_ircc_cb *self)
        switch_bank(iobase, BANK0);
        outb(inb(iobase+MCR) & ~MCR_DMA_EN, iobase+MCR);
        
-        /* Check for underrrun! */
+        /* Check for underrun! */
        if (inb(iobase+ASCR) & ASCR_TXUR) {
                self->netdev->stats.tx_errors++;
                self->netdev->stats.tx_fifo_errors++;
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 6d6479049aa1..2d456dd164fb 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -942,14 +942,14 @@ static int via_ircc_dma_xmit_complete(struct via_ircc_cb *self)
        iobase = self->io.fir_base;
        /* Disable DMA */
 //      DisableDmaChannel(self->io.dma);
-        /* Check for underrrun! */
+        /* Check for underrun! */
        /* Clear bit, by writing 1 into it */
        Tx_status = GetTXStatus(iobase);
        if (Tx_status & 0x08) {
                self->netdev->stats.tx_errors++;
                self->netdev->stats.tx_fifo_errors++;
                hwreset(self);
-// how to clear underrrun ?
+        /* how to clear underrun? */
        } else {
                self->netdev->stats.tx_packets++;
                ResetChip(iobase, 3);
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index c4366601b067..7d43506c7032 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -677,7 +677,7 @@ static void w83977af_dma_xmit_complete(struct w83977af_ir *self)
        switch_bank(iobase, SET0);
        outb(inb(iobase+HCR) & ~HCR_EN_DMA, iobase+HCR);
        
-        /* Check for underrrun! */
+        /* Check for underrun! */
        if (inb(iobase+AUDR) & AUDR_UNDR) {
                IRDA_DEBUG(0, "%s(), Transmit underrun!\n", __func__ );
                
diff --git a/drivers/net/wimax/i2400m/i2400m.h b/drivers/net/wimax/i2400m/i2400m.h
index c421a6141854..c806d4550212 100644
--- a/drivers/net/wimax/i2400m/i2400m.h
+++ b/drivers/net/wimax/i2400m/i2400m.h
@@ -75,7 +75,7 @@
 *        device is up and running or shutdown (through ifconfig up /
 *        down). Bus-generic only.
 *
- *  - control ops: control.c - implements various commmands for
+ *  - control ops: control.c - implements various commands for
 *        controlling the device. bus-generic only.
 *
 *  - device model glue: driver.c - implements helpers for the
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
index f5bd3a3cd34a..9d89d7ccdafb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/hw.c
@@ -466,8 +466,8 @@ void rtl92de_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
                bool int_migration = *(bool *) (val);
                if (int_migration) {
-                        /* Set interrrupt migration timer and
+                        /* Set interrupt migration timer and
-                         * corresponging Tx/Rx counter.
+                         * corresponding Tx/Rx counter.
                         * timer 25ns*0xfa0=100us for 0xf packets.
                         * 0x306:Rx, 0x307:Tx */
                        rtl_write_dword(rtlpriv, REG_INT_MIG, 0xfe000fa0);
diff --git a/drivers/parisc/Kconfig b/drivers/parisc/Kconfig
index 553a9905299a..620264936341 100644
--- a/drivers/parisc/Kconfig
+++ b/drivers/parisc/Kconfig
@@ -108,13 +108,6 @@ config IOMMU_HELPER
        depends on IOMMU_SBA || IOMMU_CCIO
        default y
-#config PCI_EPIC
-#       bool "EPIC/SAGA PCI support"
-#       depends on PCI
-#       default y
-#       help
-#         Say Y here for V-class PCI, DMA/IOMMU, IRQ subsystem support.
 source "drivers/pcmcia/Kconfig"
 source "drivers/pci/hotplug/Kconfig"
diff --git a/drivers/parport/parport_mfc3.c b/drivers/parport/parport_mfc3.c
index 362db31d8ca6..1c0c642b3e23 100644
--- a/drivers/parport/parport_mfc3.c
+++ b/drivers/parport/parport_mfc3.c
@@ -397,7 +397,7 @@ static void __exit parport_mfc3_exit(void)
 MODULE_AUTHOR("Joerg Dorchain <joerg@dorchain.net>");
-MODULE_DESCRIPTION("Parport Driver for Multiface 3 expansion cards Paralllel Port");
+MODULE_DESCRIPTION("Parport Driver for Multiface 3 expansion cards Parallel Port");
 MODULE_SUPPORTED_DEVICE("Multiface 3 Parallel Port");
 MODULE_LICENSE("GPL");
diff --git a/drivers/scsi/aic7xxx/aicasm/aicasm.c b/drivers/scsi/aic7xxx/aicasm/aicasm.c
index e4a778720301..2e3117aa382f 100644
--- a/drivers/scsi/aic7xxx/aicasm/aicasm.c
+++ b/drivers/scsi/aic7xxx/aicasm/aicasm.c
@@ -1,5 +1,5 @@
 /*
- * Aic7xxx SCSI host adapter firmware asssembler
+ * Aic7xxx SCSI host adapter firmware assembler
 *
 * Copyright (c) 1997, 1998, 2000, 2001 Justin T. Gibbs.
 * Copyright (c) 2001, 2002 Adaptec Inc.
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h
index d969855ac64a..d3e4d7c6f577 100644
--- a/drivers/scsi/gdth.h
+++ b/drivers/scsi/gdth.h
@@ -359,7 +359,7 @@ typedef struct {
    u32     cmd_buff_addr2;     /* physical address of cmd buffer 1 */   
    u32     cmd_buff_u_addr2;   /* reserved for 64 bit addressing */
    u32     cmd_buff_indx2;     /* cmd buf addr1 unique identifier */
-    u32     cmd_buff_size;      /* size of each cmd bufer in bytes */
+    u32     cmd_buff_size;      /* size of each cmd buffer in bytes */
    u32     reserved1;
    u32     reserved2;
 } __attribute__((packed)) gdth_perf_modes;
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c
index 218f71a8726e..d77891e5683b 100644
--- a/drivers/scsi/ips.c
+++ b/drivers/scsi/ips.c
@@ -4494,7 +4494,7 @@ ips_init_scb(ips_ha_t * ha, ips_scb_t * scb)
 /*                                                                          */
 /*   Initialize a CCB to default values                                     */
 /*                                                                          */
-/* ASSUMED to be callled from within a lock                                 */
+/* ASSUMED to be called from within a lock                                 */
 /*                                                                          */
 /****************************************************************************/
 static ips_scb_t *
diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c
index 08e26d4e3731..27cfb0cb186c 100644
--- a/drivers/scsi/jazz_esp.c
+++ b/drivers/scsi/jazz_esp.c
@@ -1,6 +1,6 @@
 /* jazz_esp.c: ESP front-end for MIPS JAZZ systems.
 *
- * Copyright (C) 2007 Thomas Bogend�rfer (tsbogend@alpha.frankende)
+ * Copyright (C) 2007 Thomas Bogendörfer (tsbogend@alpha.frankende)
 */
 #include <linux/kernel.h>
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 5163edb925cb..ea8a0b47d66d 100644
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -4105,7 +4105,7 @@ static long pmcraid_chr_ioctl(
        hdr = kmalloc(sizeof(struct pmcraid_ioctl_header), GFP_KERNEL);
        if (!hdr) {
-                pmcraid_err("faile to allocate memory for ioctl header\n");
+                pmcraid_err("failed to allocate memory for ioctl header\n");
                return -ENOMEM;
        }
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 03554934b0a5..1873940a7ccb 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -1055,7 +1055,7 @@ ql82xx_rom_lock_d(struct qla_hw_data *ha)
                    "ROM lock failed.\n");
                return -1;
        }
-        return 0;;
+        return 0;
 }
 static int
diff --git a/drivers/scsi/qla4xxx/ql4_fw.h b/drivers/scsi/qla4xxx/ql4_fw.h
index 4ac07f882521..7825c141bc1a 100644
--- a/drivers/scsi/qla4xxx/ql4_fw.h
+++ b/drivers/scsi/qla4xxx/ql4_fw.h
@@ -752,7 +752,7 @@ struct dev_db_entry {
        uint8_t res4[0x36];     /* 8A-BF */
        uint8_t iscsi_name[0xE0];       /* C0-19F : xxzzy Make this a
                                         * pointer to a string so we
-                                         * don't have to reserve soooo
+                                         * don't have to reserve so
                                         * much RAM */
        uint8_t link_local_ipv6_addr[0x10]; /* 1A0-1AF */
        uint8_t res5[0x10];     /* 1B0-1BF */
diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c
index 9acc2b2a3601..cf51432f8e72 100644
--- a/drivers/scsi/sni_53c710.c
+++ b/drivers/scsi/sni_53c710.c
@@ -51,7 +51,7 @@
 #include "53c700.h"
-MODULE_AUTHOR("Thomas Bogend�rfer");
+MODULE_AUTHOR("Thomas Bogendörfer");
 MODULE_DESCRIPTION("SNI RM 53c710 SCSI Driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:snirm_53c710");
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c
index a18996d24466..7264116185d5 100644
--- a/drivers/scsi/vmw_pvscsi.c
+++ b/drivers/scsi/vmw_pvscsi.c
@@ -1144,7 +1144,7 @@ static void pvscsi_release_resources(struct pvscsi_adapter *adapter)
 *
 * These are statically allocated.  Trying to be clever was not worth it.
 *
- * Dynamic allocation can fail, and we can't go deeep into the memory
+ * Dynamic allocation can fail, and we can't go deep into the memory
 * allocator, since we're a SCSI driver, and trying too hard to allocate
 * memory might generate disk I/O.  We also don't want to fail disk I/O
 * in that case because we can't get an allocation - the I/O could be
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 7587796224c8..56abf55e49da 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -174,8 +174,7 @@ config SPI_LM70_LLP
 config SPI_MPC52xx
        tristate "Freescale MPC52xx SPI (non-PSC) controller support"
-        depends on PPC_MPC52xx && SPI
+        depends on PPC_MPC52xx
-        select SPI_MASTER_OF
        help
          This drivers supports the MPC52xx SPI controller in master SPI
          mode.
diff --git a/drivers/staging/bcm/target_params.h b/drivers/staging/bcm/target_params.h
index 2d8b8a367b38..14876388b879 100644
--- a/drivers/staging/bcm/target_params.h
+++ b/drivers/staging/bcm/target_params.h
@@ -72,8 +72,8 @@ typedef struct _TARGET_PARAMS
        // removed SHUT down related 'unused' params from here to sync 4.x and 5.x CFG files..
    //BAMC Related Parameters
-    //Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 � Enable Band AMC signaling.
+    //Bit 0-15 Band AMC signaling configuration: Bit 1 = 1 �� Enable Band AMC signaling.
-    //bit 16-31 Band AMC Data configuration: Bit 16 = 1 � Band AMC 2x3 support.
+    //bit 16-31 Band AMC Data configuration: Bit 16 = 1 �� Band AMC 2x3 support.
        B_UINT32 m_u32BandAMCEnable;
 } stTargetParams,TARGET_PARAMS,*PTARGET_PARAMS, STARGETPARAMS, *PSTARGETPARAMS;
diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
index c75a1a1fd775..f9545b064eaf 100644
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci3200.c
@@ -3598,7 +3598,7 @@ int i_APCI3200_InterruptHandleEos(struct comedi_device *dev)
                        n = comedi_buf_write_alloc(s->async,
                                (7 + 12) * sizeof(unsigned int));
-                        /*  If not enougth memory available, event is set to Comedi Buffer Errror */
+                        /*  If not enough memory available, event is set to Comedi Buffer Error */
                        if (n > ((7 + 12) * sizeof(unsigned int))) {
                                printk("\ncomedi_buf_write_alloc n = %i", n);
                                s->async->events |= COMEDI_CB_ERROR;
diff --git a/drivers/staging/cxt1e1/libsbew.h b/drivers/staging/cxt1e1/libsbew.h
index 5c99646cd103..ae8f06d05bed 100644
--- a/drivers/staging/cxt1e1/libsbew.h
+++ b/drivers/staging/cxt1e1/libsbew.h
@@ -323,7 +323,7 @@ struct sbecom_port_param
 #define CFG_CH_DINV_TX      0x02
-/* Posssible resettable chipsets/functions */
+/* Possible resettable chipsets/functions */
 #define RESET_DEV_TEMUX     1
 #define RESET_DEV_TECT3     RESET_DEV_TEMUX
 #define RESET_DEV_PLL       2
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
index b3d743a3d308..917bbb082a6e 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
@@ -344,10 +344,10 @@ static void ft1000_reset_asic(struct net_device *dev)
        }
        mdelay(1);
        if (info->AsicID == ELECTRABUZZ_ID) {
-                // set watermark to -1 in order to not generate an interrrupt
+                // set watermark to -1 in order to not generate an interrupt
                ft1000_write_reg(dev, FT1000_REG_WATERMARK, 0xffff);
        } else {
-                // set watermark to -1 in order to not generate an interrrupt
+                // set watermark to -1 in order to not generate an interrupt
                ft1000_write_reg(dev, FT1000_REG_MAG_WATERMARK, 0xffff);
        }
        // clear interrupts
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
index aaf44c359827..43b1d363107e 100644
--- a/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
@@ -601,7 +601,7 @@ static void ft1000_reset_asic(struct net_device *dev)
        mdelay(1);
-        /* set watermark to -1 in order to not generate an interrrupt */
+        /* set watermark to -1 in order to not generate an interrupt */
        ft1000_write_register(ft1000dev, 0xffff, FT1000_REG_MAG_WATERMARK);
        /* clear interrupts */
diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c
index 2c626e0cb29c..68a4d4e8c635 100644
--- a/drivers/staging/iio/industrialio-trigger.c
+++ b/drivers/staging/iio/industrialio-trigger.c
@@ -295,7 +295,7 @@ void iio_dealloc_pollfunc(struct iio_poll_func *pf)
 EXPORT_SYMBOL_GPL(iio_dealloc_pollfunc);
 /**
- * iio_trigger_read_currrent() - trigger consumer sysfs query which trigger
+ * iio_trigger_read_current() - trigger consumer sysfs query which trigger
 *
 * For trigger consumers the current_trigger interface allows the trigger
 * used by the device to be queried.
diff --git a/drivers/staging/keucr/smilmain.c b/drivers/staging/keucr/smilmain.c
index 31f7813cab0d..cc49038e55d6 100644
--- a/drivers/staging/keucr/smilmain.c
+++ b/drivers/staging/keucr/smilmain.c
@@ -148,7 +148,7 @@ int Media_D_ReadSector(struct us_data *us, DWORD start,WORD count,BYTE *buf)
 {
        WORD len, bn;
-        //if (Check_D_MediaPower())        ; �b 6250 don't care
+        //if (Check_D_MediaPower())        ; ��b 6250 don't care
        //    return(ErrCode);
        //if (Check_D_MediaFmt(fdoExt))    ;
        //    return(ErrCode);
@@ -594,7 +594,7 @@ int Media_D_OneSectWriteFlush(PFDO_DEVICE_EXTENSION fdoExt)
 //    if (Check_D_CardStsChg())
 //        MediaChange = ERROR;
 //    //usleep(56*1024);
-//    if ((!Check_D_CntPower())&&(!MediaChange))  // �� power & Media �S�Q change, �h return success
+//    if ((!Check_D_CntPower())&&(!MediaChange))  // ���� power & Media ��S��Q change, ��h return success
 //        return(SMSUCCESS);
 //    //usleep(56*1024);
 //
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c
index 8ac3faea2d2f..f47571ea745d 100644
--- a/drivers/staging/sep/sep_driver.c
+++ b/drivers/staging/sep/sep_driver.c
@@ -1235,7 +1235,7 @@ static void sep_build_lli_table(struct sep_device *sep,
        /* Counter of lli array entry */
        u32 array_counter;
-        /* Init currrent table data size and lli array entry counter */
+        /* Init current table data size and lli array entry counter */
        curr_table_data_size = 0;
        array_counter = 0;
        *num_table_entries_ptr = 1;
diff --git a/drivers/staging/tidspbridge/Kconfig b/drivers/staging/tidspbridge/Kconfig
index 93de4f2e8bf8..21a559ecbbb1 100644
--- a/drivers/staging/tidspbridge/Kconfig
+++ b/drivers/staging/tidspbridge/Kconfig
@@ -78,7 +78,7 @@ config TIDSPBRIDGE_NTFY_PWRERR
        bool "Notify power errors"
        depends on TIDSPBRIDGE
        help
-          Enable notifications to registered clients on the event of power errror
+          Enable notifications to registered clients on the event of power error
          trying to suspend bridge driver. Say Y, to signal this event as a fatal
          error, this will require a bridge restart to recover.
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c
index a7e407e25187..fda240214cd6 100644
--- a/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -285,7 +285,7 @@ int dcd_enumerate_object(s32 index, enum dsp_dcdobjtype obj_type,
                        enum_refs = 0;
                        /*
-                         * TODO: Revisit, this is not an errror case but code
+                         * TODO: Revisit, this is not an error case but code
                         * expects non-zero value.
                         */
                        status = ENODATA;
diff --git a/drivers/staging/wlags49_h2/debug.h b/drivers/staging/wlags49_h2/debug.h
index 8d5dddf08055..811698f1070c 100644
--- a/drivers/staging/wlags49_h2/debug.h
+++ b/drivers/staging/wlags49_h2/debug.h
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/dhfcfg.h b/drivers/staging/wlags49_h2/dhfcfg.h
index 75c279f268ae..147f4c83c00c 100644
--- a/drivers/staging/wlags49_h2/dhfcfg.h
+++ b/drivers/staging/wlags49_h2/dhfcfg.h
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/hcf.c b/drivers/staging/wlags49_h2/hcf.c
index 7dc176a95aab..b008773323b3 100644
--- a/drivers/staging/wlags49_h2/hcf.c
+++ b/drivers/staging/wlags49_h2/hcf.c
@@ -32,9 +32,9 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * COPYRIGHT � 1994 - 1995   by AT&T.                All Rights Reserved
+ * COPYRIGHT �� 1994 - 1995   by AT&T.                All Rights Reserved
- * COPYRIGHT � 1996 - 2000 by Lucent Technologies.   All Rights Reserved
+ * COPYRIGHT �� 1996 - 2000 by Lucent Technologies.   All Rights Reserved
- * COPYRIGHT � 2001 - 2004   by Agere Systems Inc.   All Rights Reserved
+ * COPYRIGHT �� 2001 - 2004   by Agere Systems Inc.   All Rights Reserved
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
diff --git a/drivers/staging/wlags49_h2/hcf.h b/drivers/staging/wlags49_h2/hcf.h
index 000994731166..95527b5cf863 100644
--- a/drivers/staging/wlags49_h2/hcf.h
+++ b/drivers/staging/wlags49_h2/hcf.h
@@ -40,9 +40,9 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
-* COPYRIGHT � 1994 - 1995       by AT&T.                                All Rights Reserved
+* COPYRIGHT �� 1994 - 1995      by AT&T.                                All Rights Reserved
-* COPYRIGHT � 1996 - 2000 by Lucent Technologies.       All Rights Reserved
+* COPYRIGHT �� 1996 - 2000 by Lucent Technologies.      All Rights Reserved
-* COPYRIGHT � 2001 - 2004       by Agere Systems Inc.   All Rights Reserved
+* COPYRIGHT �� 2001 - 2004      by Agere Systems Inc.   All Rights Reserved
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
diff --git a/drivers/staging/wlags49_h2/hcfcfg.h b/drivers/staging/wlags49_h2/hcfcfg.h
index 7545bc554112..ef60da8c3ebc 100644
--- a/drivers/staging/wlags49_h2/hcfcfg.h
+++ b/drivers/staging/wlags49_h2/hcfcfg.h
@@ -64,9 +64,9 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
-* COPYRIGHT � 1994 - 1995       by AT&T.                                All Rights Reserved
+* COPYRIGHT �� 1994 - 1995      by AT&T.                                All Rights Reserved
-* COPYRIGHT � 1996 - 2000 by Lucent Technologies.       All Rights Reserved
+* COPYRIGHT �� 1996 - 2000 by Lucent Technologies.      All Rights Reserved
-* COPYRIGHT � 2001 - 2004       by Agere Systems Inc.   All Rights Reserved
+* COPYRIGHT �� 2001 - 2004      by Agere Systems Inc.   All Rights Reserved
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
diff --git a/drivers/staging/wlags49_h2/hcfdef.h b/drivers/staging/wlags49_h2/hcfdef.h
index a62b53a22891..30744e194a23 100644
--- a/drivers/staging/wlags49_h2/hcfdef.h
+++ b/drivers/staging/wlags49_h2/hcfdef.h
@@ -33,9 +33,9 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * COPYRIGHT � 1994 - 1995   by AT&T.                All Rights Reserved
+ * COPYRIGHT �� 1994 - 1995   by AT&T.                All Rights Reserved
- * COPYRIGHT � 1996 - 2000 by Lucent Technologies.   All Rights Reserved
+ * COPYRIGHT �� 1996 - 2000 by Lucent Technologies.   All Rights Reserved
- * COPYRIGHT � 2001 - 2004   by Agere Systems Inc.   All Rights Reserved
+ * COPYRIGHT �� 2001 - 2004   by Agere Systems Inc.   All Rights Reserved
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
diff --git a/drivers/staging/wlags49_h2/mdd.h b/drivers/staging/wlags49_h2/mdd.h
index b02e3ea9e479..5f951efb9c07 100644
--- a/drivers/staging/wlags49_h2/mdd.h
+++ b/drivers/staging/wlags49_h2/mdd.h
@@ -33,9 +33,9 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
-* COPYRIGHT � 1994 - 1995       by AT&T.                                All Rights Reserved
+* COPYRIGHT �� 1994 - 1995      by AT&T.                                All Rights Reserved
-* COPYRIGHT � 1996 - 2000 by Lucent Technologies.       All Rights Reserved
+* COPYRIGHT �� 1996 - 2000 by Lucent Technologies.      All Rights Reserved
-* COPYRIGHT � 2001 - 2004       by Agere Systems Inc.   All Rights Reserved
+* COPYRIGHT �� 2001 - 2004      by Agere Systems Inc.   All Rights Reserved
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
diff --git a/drivers/staging/wlags49_h2/mmd.c b/drivers/staging/wlags49_h2/mmd.c
index de138c481a9e..c8f52107e6ca 100644
--- a/drivers/staging/wlags49_h2/mmd.c
+++ b/drivers/staging/wlags49_h2/mmd.c
@@ -35,7 +35,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
-* COPYRIGHT � 2001 - 2004       by Agere Systems Inc.   All Rights Reserved
+* COPYRIGHT �� 2001 - 2004      by Agere Systems Inc.   All Rights Reserved
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
diff --git a/drivers/staging/wlags49_h2/mmd.h b/drivers/staging/wlags49_h2/mmd.h
index 06890c1b30a4..914952513005 100644
--- a/drivers/staging/wlags49_h2/mmd.h
+++ b/drivers/staging/wlags49_h2/mmd.h
@@ -33,7 +33,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
-* COPYRIGHT � 2001 - 2004       by Agere Systems Inc.   All Rights Reserved
+* COPYRIGHT �� 2001 - 2004      by Agere Systems Inc.   All Rights Reserved
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
diff --git a/drivers/staging/wlags49_h2/wl_cs.h b/drivers/staging/wlags49_h2/wl_cs.h
index 21f17be4f02a..a7ab579759de 100644
--- a/drivers/staging/wlags49_h2/wl_cs.h
+++ b/drivers/staging/wlags49_h2/wl_cs.h
@@ -22,7 +22,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_enc.c b/drivers/staging/wlags49_h2/wl_enc.c
index 26cf5486edd6..4c6f776cc4da 100644
--- a/drivers/staging/wlags49_h2/wl_enc.c
+++ b/drivers/staging/wlags49_h2/wl_enc.c
@@ -23,7 +23,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -44,7 +44,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_enc.h b/drivers/staging/wlags49_h2/wl_enc.h
index b4f54d81f311..46629f3b112b 100644
--- a/drivers/staging/wlags49_h2/wl_enc.h
+++ b/drivers/staging/wlags49_h2/wl_enc.h
@@ -22,7 +22,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_if.h b/drivers/staging/wlags49_h2/wl_if.h
index ed2b4135a10e..6a26130f5a3a 100644
--- a/drivers/staging/wlags49_h2/wl_if.h
+++ b/drivers/staging/wlags49_h2/wl_if.h
@@ -23,7 +23,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -44,7 +44,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_internal.h b/drivers/staging/wlags49_h2/wl_internal.h
index 575340834051..553601f48873 100644
--- a/drivers/staging/wlags49_h2/wl_internal.h
+++ b/drivers/staging/wlags49_h2/wl_internal.h
@@ -22,7 +22,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_main.c b/drivers/staging/wlags49_h2/wl_main.c
index 483eee1bf63a..dab603e0f452 100644
--- a/drivers/staging/wlags49_h2/wl_main.c
+++ b/drivers/staging/wlags49_h2/wl_main.c
@@ -23,7 +23,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -44,7 +44,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_main.h b/drivers/staging/wlags49_h2/wl_main.h
index d593ae535fb8..3b5acdf4e329 100644
--- a/drivers/staging/wlags49_h2/wl_main.h
+++ b/drivers/staging/wlags49_h2/wl_main.h
@@ -22,7 +22,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c
index 5a2b334f206e..9c16f5478a75 100644
--- a/drivers/staging/wlags49_h2/wl_netdev.c
+++ b/drivers/staging/wlags49_h2/wl_netdev.c
@@ -23,7 +23,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -44,7 +44,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_netdev.h b/drivers/staging/wlags49_h2/wl_netdev.h
index 632ab2e6302c..61f040f26d97 100644
--- a/drivers/staging/wlags49_h2/wl_netdev.h
+++ b/drivers/staging/wlags49_h2/wl_netdev.h
@@ -23,7 +23,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -44,7 +44,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c
index 28ae9dd1b44e..1f1d98679171 100644
--- a/drivers/staging/wlags49_h2/wl_pci.c
+++ b/drivers/staging/wlags49_h2/wl_pci.c
@@ -23,7 +23,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -44,7 +44,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_pci.h b/drivers/staging/wlags49_h2/wl_pci.h
index cea04c44ec47..86831f1b4de2 100644
--- a/drivers/staging/wlags49_h2/wl_pci.h
+++ b/drivers/staging/wlags49_h2/wl_pci.h
@@ -22,7 +22,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_priv.c b/drivers/staging/wlags49_h2/wl_priv.c
index 260d4f0d47b4..f30e5ee4bca3 100644
--- a/drivers/staging/wlags49_h2/wl_priv.c
+++ b/drivers/staging/wlags49_h2/wl_priv.c
@@ -22,7 +22,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_priv.h b/drivers/staging/wlags49_h2/wl_priv.h
index 9b0254497aa7..b647bfd90098 100644
--- a/drivers/staging/wlags49_h2/wl_priv.h
+++ b/drivers/staging/wlags49_h2/wl_priv.h
@@ -22,7 +22,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_profile.c b/drivers/staging/wlags49_h2/wl_profile.c
index a459e48c7bf0..b8c96cf18de5 100644
--- a/drivers/staging/wlags49_h2/wl_profile.c
+++ b/drivers/staging/wlags49_h2/wl_profile.c
@@ -23,7 +23,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -44,7 +44,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_profile.h b/drivers/staging/wlags49_h2/wl_profile.h
index 81db8e8c6ba8..f81df51d2216 100644
--- a/drivers/staging/wlags49_h2/wl_profile.h
+++ b/drivers/staging/wlags49_h2/wl_profile.h
@@ -22,7 +22,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_util.c b/drivers/staging/wlags49_h2/wl_util.c
index 3b6f5a59b2bb..b748a3ff7954 100644
--- a/drivers/staging/wlags49_h2/wl_util.c
+++ b/drivers/staging/wlags49_h2/wl_util.c
@@ -22,7 +22,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_util.h b/drivers/staging/wlags49_h2/wl_util.h
index 2661bcd6b0ec..946b1b64c46f 100644
--- a/drivers/staging/wlags49_h2/wl_util.h
+++ b/drivers/staging/wlags49_h2/wl_util.h
@@ -23,7 +23,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -44,7 +44,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_version.h b/drivers/staging/wlags49_h2/wl_version.h
index fd37040afd01..3deacfac9d25 100644
--- a/drivers/staging/wlags49_h2/wl_version.h
+++ b/drivers/staging/wlags49_h2/wl_version.h
@@ -23,7 +23,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -44,7 +44,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c
index 8ac5e1081aa0..7ff0a108da13 100644
--- a/drivers/staging/wlags49_h2/wl_wext.c
+++ b/drivers/staging/wlags49_h2/wl_wext.c
@@ -18,7 +18,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -39,7 +39,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/staging/wlags49_h2/wl_wext.h b/drivers/staging/wlags49_h2/wl_wext.h
index a713058c8027..029da52c4c49 100644
--- a/drivers/staging/wlags49_h2/wl_wext.h
+++ b/drivers/staging/wlags49_h2/wl_wext.h
@@ -22,7 +22,7 @@
 * software indicates your acceptance of these terms and conditions.  If you do
 * not agree with these terms and conditions, do not use the software.
 *
- * Copyright � 2003 Agere Systems Inc.
+ * Copyright �� 2003 Agere Systems Inc.
 * All rights reserved.
 *
 * Redistribution and use in source or binary forms, with or without
@@ -43,7 +43,7 @@
 *
 * Disclaimer
 *
- * THIS SOFTWARE IS PROVIDED �AS IS� AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * THIS SOFTWARE IS PROVIDED ��AS IS�� AND ANY EXPRESS OR IMPLIED WARRANTIES,
 * INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  ANY
 * USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 925a1e547a83..95b21a619900 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -808,7 +808,7 @@ config BFIN_UART3_CTSRTS
 config SERIAL_IMX
        bool "IMX serial port support"
-        depends on ARM && (ARCH_IMX || ARCH_MXC)
+        depends on ARCH_MXC
        select SERIAL_CORE
        select RATIONAL
        help
diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 23a447373c51..12a401a144b7 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -264,7 +264,6 @@ config USB_PXA27X
 config USB_S3C_HSOTG
        tristate "S3C HS/OtG USB Device controller"
        depends on S3C_DEV_USB_HSOTG
-        select USB_GADGET_S3C_HSOTG_PIO
        select USB_GADGET_DUALSPEED
        help
          The Samsung S3C64XX USB2.0 high-speed gadget controller
diff --git a/drivers/usb/gadget/s3c2410_udc.c b/drivers/usb/gadget/s3c2410_udc.c
index b8643771fa80..fac4c650d4bb 100644
--- a/drivers/usb/gadget/s3c2410_udc.c
+++ b/drivers/usb/gadget/s3c2410_udc.c
@@ -3,7 +3,7 @@
 *
 * Samsung S3C24xx series on-chip full speed USB device controllers
 *
- * Copyright (C) 2004-2007 Herbert P�tzl - Arnaud Patard
+ * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard
 *      Additional cleanups by Ben Dooks <ben-linux@fluff.org>
 *
 * This program is free software; you can redistribute it and/or modify
@@ -51,7 +51,7 @@
 #define DRIVER_DESC     "S3C2410 USB Device Controller Gadget"
 #define DRIVER_VERSION  "29 Apr 2007"
-#define DRIVER_AUTHOR   "Herbert P�tzl <herbert@13thfloor.at>, " \
+#define DRIVER_AUTHOR   "Herbert Pötzl <herbert@13thfloor.at>, " \
                        "Arnaud Patard <arnaud.patard@rtp-net.org>"
 static const char               gadget_name[] = "s3c2410_udc";
diff --git a/drivers/usb/gadget/s3c2410_udc.h b/drivers/usb/gadget/s3c2410_udc.h
index a48f619cb1cc..1653bae08b80 100644
--- a/drivers/usb/gadget/s3c2410_udc.h
+++ b/drivers/usb/gadget/s3c2410_udc.h
@@ -2,7 +2,7 @@
 * linux/drivers/usb/gadget/s3c2410_udc.h
 * Samsung on-chip full speed USB device controllers
 *
- * Copyright (C) 2004-2007 Herbert P�tzl - Arnaud Patard
+ * Copyright (C) 2004-2007 Herbert Pötzl - Arnaud Patard
 *      Additional cleanups by Ben Dooks <ben-linux@fluff.org>
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
index 056fb2d37c88..43b3ca48d753 100644
--- a/drivers/usb/host/hwa-hc.c
+++ b/drivers/usb/host/hwa-hc.c
@@ -481,7 +481,7 @@ static int __hwahc_op_set_ptk(struct wusbhc *wusbhc, u8 port_idx, u32 tkid,
                encryption_value = 0;
        }
-        /* Set the encryption type for commmunicating with the device */
+        /* Set the encryption type for communicating with the device */
        result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
                        USB_REQ_SET_ENCRYPTION,
                        USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c
index 2ee18cfa1efe..dbf0f156ed9e 100644
--- a/drivers/usb/host/imx21-hcd.c
+++ b/drivers/usb/host/imx21-hcd.c
@@ -473,7 +473,7 @@ static void free_epdmem(struct imx21 *imx21, struct usb_host_endpoint *ep)
 /* End handling                                 */
 /* ===========================================  */
-/* Endpoint now idle - release it's ETD(s) or asssign to queued request */
+/* Endpoint now idle - release its ETD(s) or assign to queued request */
 static void ep_idle(struct imx21 *imx21, struct ep_priv *ep_priv)
 {
        int i;
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c
index 318fb4e8a885..53be7aef6308 100644
--- a/drivers/usb/musb/cppi_dma.c
+++ b/drivers/usb/musb/cppi_dma.c
@@ -513,7 +513,7 @@ static inline int cppi_autoreq_update(struct cppi_channel *rx,
                if (!(val & MUSB_RXCSR_H_REQPKT)) {
                        val |= MUSB_RXCSR_H_REQPKT | MUSB_RXCSR_H_WZC_BITS;
                        musb_writew(regs, MUSB_RXCSR, val);
-                        /* flush writebufer */
+                        /* flush writebuffer */
                        val = musb_readw(regs, MUSB_RXCSR);
                }
        }
diff --git a/drivers/usb/otg/fsl_otg.c b/drivers/usb/otg/fsl_otg.c
index 0f420b25e9a9..2d9cc445fc73 100644
--- a/drivers/usb/otg/fsl_otg.c
+++ b/drivers/usb/otg/fsl_otg.c
@@ -639,7 +639,7 @@ static int fsl_otg_set_power(struct otg_transceiver *otg_p, unsigned mA)
 * Delayed pin detect interrupt processing.
 *
 * When the Mini-A cable is disconnected from the board,
- * the pin-detect interrupt happens before the disconnnect
+ * the pin-detect interrupt happens before the disconnect
 * interrupts for the connected device(s).  In order to
 * process the disconnect interrupt(s) prior to switching
 * roles, the pin-detect interrupts are delayed, and handled
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 055b64ef0bba..df1d7da933ec 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -2,7 +2,7 @@
 * vendor/product IDs (VID/PID) of devices using FTDI USB serial converters.
 * Please keep numerically sorted within individual areas, thanks!
 *
- * Philipp G�hring - pg@futureware.at - added the Device ID of the USB relais
+ * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais
 * from Rudolf Gugler
 *
 */
@@ -78,7 +78,7 @@
 */
 #define FTDI_ASK_RDR400_PID     0xC991  /* ASK RDR 400 series card reader */
-/* www.starting-point-systems.com �Chameleon device */
+/* www.starting-point-systems.com ��Chameleon device */
 #define FTDI_MICRO_CHAMELEON_PID        0xCAA0  /* Product Id */
 /*
@@ -291,7 +291,7 @@
 /*
 * Teratronik product ids.
- * Submitted by O. W�lfelschneider.
+ * Submitted by O. Wölfelschneider.
 */
 #define FTDI_TERATRONIK_VCP_PID  0xEC88 /* Teratronik device (preferring VCP driver on windows) */
 #define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 6d6923317f10..93d359f4d6a7 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -61,7 +61,7 @@
 #include "scsiglue.h"
 MODULE_DESCRIPTION("Driver for In-System Design, Inc. ISD200 ASIC");
-MODULE_AUTHOR("Bj�rn Stenberg <bjorn@haxx.se>");
+MODULE_AUTHOR("Björn Stenberg <bjorn@haxx.se>");
 MODULE_LICENSE("GPL");
 static int isd200_Initialization(struct us_data *us);
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 24caba79d722..856ad92c40de 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -1914,7 +1914,7 @@ UNUSUAL_DEV(  0x1b1c, 0x1ab5, 0x0200, 0x0200,
                USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                US_FL_INITIAL_READ10 ),
-/* Patch by Richard Sch�tz <r.schtz@t-online.de>
+/* Patch by Richard Schütz <r.schtz@t-online.de>
 * This external hard drive enclosure uses a JMicron chip which
 * needs the US_FL_IGNORE_RESIDUE flag to work properly. */
 UNUSUAL_DEV(  0x1e68, 0x001b, 0x0000, 0x0000,
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c
index c8f684833d58..2bfc846ac071 100644
--- a/drivers/uwb/i1480/dfu/usb.c
+++ b/drivers/uwb/i1480/dfu/usb.c
@@ -104,7 +104,7 @@ void i1480_usb_destroy(struct i1480_usb *i1480_usb)
 *
 * Data buffers to USB cannot be on the stack or in vmalloc'ed areas,
 * so we copy it to the local i1480 buffer before proceeding. In any
- * case, we have a max size we can send, soooo.
+ * case, we have a max size we can send.
 */
 static
 int i1480_usb_write(struct i1480 *i1480, u32 memory_address,
diff --git a/drivers/video/bf54x-lq043fb.c b/drivers/video/bf54x-lq043fb.c
index 56720fb476b3..46b03f53985f 100644
--- a/drivers/video/bf54x-lq043fb.c
+++ b/drivers/video/bf54x-lq043fb.c
@@ -4,7 +4,7 @@
 * Author:       Michael Hennerich <hennerich@blackfin.uclinux.org>
 *
 * Created:
- * Description:  ADSP-BF54x Framebufer driver
+ * Description:  ADSP-BF54x Framebuffer driver
 *
 *
 * Modified:
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c
index d5e126759612..7a0c05f3537e 100644
--- a/drivers/video/bfin-t350mcqb-fb.c
+++ b/drivers/video/bfin-t350mcqb-fb.c
@@ -4,7 +4,7 @@
 * Author:       Michael Hennerich <hennerich@blackfin.uclinux.org>
 *
 * Created:
- * Description:  Blackfin LCD Framebufer driver
+ * Description:  Blackfin LCD Framebuffer driver
 *
 *
 * Modified:
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 2209e354f531..c2d11fef114b 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -66,8 +66,6 @@ config SGI_NEWPORT_CONSOLE
          Say Y here if you want the console on the Newport aka XL graphics
          card of your Indy.  Most people say Y here.
-#  bool 'IODC console' CONFIG_IODC_CONSOLE
 config DUMMY_CONSOLE
        bool
        depends on VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y 
diff --git a/drivers/video/omap/rfbi.c b/drivers/video/omap/rfbi.c
index 0c6981f1a4a3..2c1a3402bef0 100644
--- a/drivers/video/omap/rfbi.c
+++ b/drivers/video/omap/rfbi.c
@@ -2,7 +2,7 @@
 * OMAP2 Remote Frame Buffer Interface support
 *
 * Copyright (C) 2005 Nokia Corporation
- * Author: Juha Yrj�l� <juha.yrjola@nokia.com>
+ * Author: Juha Yrjölä <juha.yrjola@nokia.com>
 *         Imre Deak <imre.deak@nokia.com>
 *
 * This program is free software; you can redistribute it and/or modify it
diff --git a/drivers/video/omap/sossi.c b/drivers/video/omap/sossi.c
index 8fb7c708f563..f79c137753d7 100644
--- a/drivers/video/omap/sossi.c
+++ b/drivers/video/omap/sossi.c
@@ -2,7 +2,7 @@
 * OMAP1 Special OptimiSed Screen Interface support
 *
 * Copyright (C) 2004-2005 Nokia Corporation
- * Author: Juha Yrj�l� <juha.yrjola@nokia.com>
+ * Author: Juha Yrjölä <juha.yrjola@nokia.com>
 *
 * This program is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License as published by the
diff --git a/drivers/watchdog/w83627hf_wdt.c b/drivers/watchdog/w83627hf_wdt.c
index dd5d67548758..576a388a1164 100644
--- a/drivers/watchdog/w83627hf_wdt.c
+++ b/drivers/watchdog/w83627hf_wdt.c
@@ -4,7 +4,7 @@
 *      (c) Copyright 2007 Vlad Drukker <vlad@storewiz.com>
 *              added support for W83627THF.
 *
- *      (c) Copyright 2003,2007 P�draig Brady <P@draigBrady.com>
+ *      (c) Copyright 2003,2007 Pádraig Brady <P@draigBrady.com>
 *
 *      Based on advantechwdt.c which is based on wdt.c.
 *      Original copyright messages:
@@ -401,6 +401,6 @@ module_init(wdt_init);
 module_exit(wdt_exit);
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("P�draig Brady <P@draigBrady.com>");
+MODULE_AUTHOR("Pádraig  Brady <P@draigBrady.com>");
 MODULE_DESCRIPTION("w83627hf/thf WDT driver");
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids
index de24e3decedd..119abea8c6cb 100644
--- a/drivers/zorro/zorro.ids
+++ b/drivers/zorro/zorro.ids
@@ -351,7 +351,7 @@
        0200  EGS 28/24 Spectrum [Graphics Card]
 0892  Apollo
        0100  A1200 [FPU and RAM Expansion]
-0893  Ingenieurb�ro Helfrich
+0893  Ingenieurbüro Helfrich
        0500  Piccolo RAM [Graphics Card]
        0600  Piccolo [Graphics Card]
        0700  PeggyPlus MPEG [Video Card]
diff --git a/fs/btrfs/free-space-cache.c b/fs/btrfs/free-space-cache.c
index ec23d43d0c35..9a897bf79538 100644
--- a/fs/btrfs/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
@@ -423,7 +423,7 @@ static void io_ctl_set_crc(struct io_ctl *io_ctl, int index)
        }
        if (index == 0)
-                offset = sizeof(u32) * io_ctl->num_pages;;
+                offset = sizeof(u32) * io_ctl->num_pages;
        crc = btrfs_csum_data(io_ctl->root, io_ctl->orig + offset, crc,
                              PAGE_CACHE_SIZE - offset);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 2f426a51e60d..81b235a61f8c 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1944,7 +1944,7 @@ enum btrfs_orphan_cleanup_state {
 };
 /*
- * This is called in transaction commmit time. If there are no orphan
+ * This is called in transaction commit time. If there are no orphan
 * files in the subvolume, it removes orphan item and frees block_rsv
 * structure.
 */
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index 85fe655fe3e0..15cb47088aac 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -2490,7 +2490,7 @@ int ext3_can_truncate(struct inode *inode)
 * transaction, and VFS/VM ensures that ext3_truncate() cannot run
 * simultaneously on behalf of the same inode.
 *
- * As we work through the truncate and commmit bits of it to the journal there
+ * As we work through the truncate and commit bits of it to the journal there
 * is one core, guiding principle: the file's tree must always be consistent on
 * disk.  We must be able to restart the truncate after a crash.
 *
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 92655fd89657..7dbcc3e84570 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1881,7 +1881,7 @@ static void ext4_end_io_buffer_write(struct buffer_head *bh, int uptodate);
 * a[0] = 'a';
 * truncate(f, 4096);
 * we have in the page first buffer_head mapped via page_mkwrite call back
- * but other bufer_heads would be unmapped but dirty(dirty done via the
+ * but other buffer_heads would be unmapped but dirty (dirty done via the
 * do_wp_page). So writepage should write the first block. If we modify
 * the mmap area beyond 1024 we will again get a page_fault and the
 * page_mkwrite callback will do the block allocation and mark the
@@ -3469,7 +3469,7 @@ int ext4_punch_hole(struct file *file, loff_t offset, loff_t length)
 * transaction, and VFS/VM ensures that ext4_truncate() cannot run
 * simultaneously on behalf of the same inode.
 *
- * As we work through the truncate and commmit bits of it to the journal there
+ * As we work through the truncate and commit bits of it to the journal there
 * is one core, guiding principle: the file's tree must always be consistent on
 * disk.  We must be able to restart the truncate after a crash.
 *
diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 7873797cc76a..3ab841054d53 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -897,7 +897,7 @@ enum {
        Opt_charset, Opt_shortname_lower, Opt_shortname_win95,
        Opt_shortname_winnt, Opt_shortname_mixed, Opt_utf8_no, Opt_utf8_yes,
        Opt_uni_xl_no, Opt_uni_xl_yes, Opt_nonumtail_no, Opt_nonumtail_yes,
-        Opt_obsolate, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont,
+        Opt_obsolete, Opt_flush, Opt_tz_utc, Opt_rodir, Opt_err_cont,
        Opt_err_panic, Opt_err_ro, Opt_discard, Opt_err,
 };
@@ -927,17 +927,17 @@ static const match_table_t fat_tokens = {
        {Opt_err_panic, "errors=panic"},
        {Opt_err_ro, "errors=remount-ro"},
        {Opt_discard, "discard"},
-        {Opt_obsolate, "conv=binary"},
+        {Opt_obsolete, "conv=binary"},
-        {Opt_obsolate, "conv=text"},
+        {Opt_obsolete, "conv=text"},
-        {Opt_obsolate, "conv=auto"},
+        {Opt_obsolete, "conv=auto"},
-        {Opt_obsolate, "conv=b"},
+        {Opt_obsolete, "conv=b"},
-        {Opt_obsolate, "conv=t"},
+        {Opt_obsolete, "conv=t"},
-        {Opt_obsolate, "conv=a"},
+        {Opt_obsolete, "conv=a"},
-        {Opt_obsolate, "fat=%u"},
+        {Opt_obsolete, "fat=%u"},
-        {Opt_obsolate, "blocksize=%u"},
+        {Opt_obsolete, "blocksize=%u"},
-        {Opt_obsolate, "cvf_format=%20s"},
+        {Opt_obsolete, "cvf_format=%20s"},
-        {Opt_obsolate, "cvf_options=%100s"},
+        {Opt_obsolete, "cvf_options=%100s"},
-        {Opt_obsolate, "posix"},
+        {Opt_obsolete, "posix"},
        {Opt_err, NULL},
 };
 static const match_table_t msdos_tokens = {
@@ -1169,7 +1169,7 @@ static int parse_options(struct super_block *sb, char *options, int is_vfat,
                        break;
                /* obsolete mount options */
-                case Opt_obsolate:
+                case Opt_obsolete:
                        fat_msg(sb, KERN_INFO, "\"%s\" option is obsolete, "
                               "not supported now", p);
                        break;
diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index f94fc48ff3a0..5d1a00a5041b 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -537,7 +537,7 @@ int cleanup_journal_tail(journal_t *journal)
 * them.
 *
 * Called with j_list_lock held.
- * Returns number of bufers reaped (for debug)
+ * Returns number of buffers reaped (for debug)
 */
 static int journal_clean_one_cp_list(struct journal_head *jh, int *released)
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index 16a698bd906d..d49d202903fb 100644
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -565,7 +565,7 @@ int jbd2_cleanup_journal_tail(journal_t *journal)
 *
 * Called with the journal locked.
 * Called with j_list_lock held.
- * Returns number of bufers reaped (for debug)
+ * Returns number of buffers reaped (for debug)
 */
 static int journal_clean_one_cp_list(struct journal_head *jh, int *released)
diff --git a/fs/namespace.c b/fs/namespace.c
index 7e6f2c9dc7c4..e6081996c9a2 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -324,9 +324,7 @@ int mnt_want_write(struct vfsmount *m)
        if (mnt_is_readonly(m)) {
                mnt_dec_writers(mnt);
                ret = -EROFS;
-                goto out;
        }
-out:
        preempt_enable();
        return ret;
 }
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 47e94e33a975..9ca16dc09e04 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -658,7 +658,7 @@ static int nfsd4_sanitize_slot_size(u32 size)
 /*
 * XXX: If we run out of reserved DRC memory we could (up to a point)
 * re-negotiate active sessions and reduce their slot usage to make
- * rooom for new connections. For now we just fail the create session.
+ * room for new connections. For now we just fail the create session.
 */
 static int nfsd4_get_drc_mem(int slotsize, u32 num)
 {
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 6e396683c3d4..061591a3ab08 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2128,7 +2128,7 @@ static int ocfs2_prepare_inode_for_write(struct file *file,
                 * remove_suid() calls ->setattr without any hint that
                 * we may have already done our cluster locking. Since
                 * ocfs2_setattr() *must* take cluster locks to
-                 * proceeed, this will lead us to recursively lock the
+                 * proceed, this will lead us to recursively lock the
                 * inode. There's also the dinode i_size state which
                 * can be lost via setattr during extending writes (we
                 * set inode->i_size at the end of a write. */
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c
index b90c7967fcae..2bfd987f4853 100644
--- a/fs/qnx4/inode.c
+++ b/fs/qnx4/inode.c
@@ -199,12 +199,13 @@ static const char *qnx4_checkroot(struct super_block *sb)
                                        if (!strcmp(rootdir->di_fname,
                                                    QNX4_BMNAME)) {
                                                found = 1;
-                                                qnx4_sb(sb)->BitMap = kmalloc( sizeof( struct qnx4_inode_entry ), GFP_KERNEL );
+                                                qnx4_sb(sb)->BitMap = kmemdup(rootdir,
+                                                                              sizeof(struct qnx4_inode_entry),
+                                                                              GFP_KERNEL);
                                                if (!qnx4_sb(sb)->BitMap) {
                                                        brelse (bh);
                                                        return "not enough memory for bitmap inode";
-                                                }
+                                                }/* keep bitmap inode known */
-                                                memcpy( qnx4_sb(sb)->BitMap, rootdir, sizeof( struct qnx4_inode_entry ) );      /* keep bitmap inode known */
                                                break;
                                        }
                                }
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
index ce6249dae90c..4dff85c7d7eb 100644
--- a/fs/xfs/xfs_buf.c
+++ b/fs/xfs/xfs_buf.c
@@ -1370,7 +1370,7 @@ restart:
                        goto restart;
                }
                /*
-                 * clear the LRU reference count so the bufer doesn't get
+                 * clear the LRU reference count so the buffer doesn't get
                 * ignored in xfs_buf_rele().
                 */
                atomic_set(&bp->b_lru_ref, 0);
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 753ed9b5c70b..f675f3d9d7b3 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -209,10 +209,10 @@ xfs_file_fsync(
        /*
         * First check if the VFS inode is marked dirty.  All the dirtying
-         * of non-transactional updates no goes through mark_inode_dirty*,
+         * of non-transactional updates do not go through mark_inode_dirty*,
-         * which allows us to distinguish beteeen pure timestamp updates
+         * which allows us to distinguish between pure timestamp updates
         * and i_size updates which need to be caught for fdatasync.
-         * After that also theck for the dirty state in the XFS inode, which
+         * After that also check for the dirty state in the XFS inode, which
         * might gets cleared when the inode gets written out via the AIL
         * or xfs_iflush_cluster.
         */
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c
index 26db6b13f1f9..d4fadbe8ac90 100644
--- a/fs/xfs/xfs_log_cil.c
+++ b/fs/xfs/xfs_log_cil.c
@@ -279,7 +279,7 @@ xfs_cil_prepare_item(
 * Insert the log items into the CIL and calculate the difference in space
 * consumed by the item. Add the space to the checkpoint ticket and calculate
 * if the change requires additional log metadata. If it does, take that space
- * as well. Remove the amount of space we addded to the checkpoint ticket from
+ * as well. Remove the amount of space we added to the checkpoint ticket from
 * the current transaction ticket so that the accounting works out correctly.
 */
 static void
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 1f9e9516e2b7..e8acca892af0 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -820,7 +820,7 @@ struct drm_driver {
         * Specifically, the timestamp in @vblank_time should correspond as
         * closely as possible to the time when the first video scanline of
         * the video frame after the end of VBLANK will start scanning out,
-         * the time immmediately after end of the VBLANK interval. If the
+         * the time immediately after end of the VBLANK interval. If the
         * @crtc is currently inside VBLANK, this will be a time in the future.
         * If the @crtc is currently scanning out a frame, this will be the
         * past start time of the current scanout. This is meant to adhere
diff --git a/include/linux/cordic.h b/include/linux/cordic.h
index f932093e20c2..cf68ca4a508c 100644
--- a/include/linux/cordic.h
+++ b/include/linux/cordic.h
@@ -35,8 +35,8 @@ struct cordic_iq {
 * @theta: angle in degrees for which i/q coordinate is to be calculated.
 * @coord: function output parameter holding the i/q coordinate.
 *
- * The function calculates the i/q coordinate for a given angle using
+ * The function calculates the i/q coordinate for a given angle using the
- * cordic algorithm. The coordinate consists of a real (i) and an
+ * CORDIC algorithm. The coordinate consists of a real (i) and an
 * imaginary (q) part. The real part is essentially the cosine of the
 * angle and the imaginary part is the sine of the angle. The returned
 * values are scaled by 2^16 for precision. The range for theta is
diff --git a/include/linux/security.h b/include/linux/security.h
index 4298d2dbafa3..98112cf93884 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -186,7 +186,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 * Security module identifier.
 *
 * @name:
- *      A string that acts as a unique identifeir for the LSM with max number
+ *      A string that acts as a unique identifier for the LSM with max number
 *      of characters = SECURITY_NAME_MAX.
 *
 * Security hooks for program execution operations.
@@ -275,7 +275,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @copy copied data which will be passed to the security module.
 *      Returns 0 if the copy was successful.
 * @sb_remount:
- *      Extracts security system specifc mount options and verifys no changes
+ *      Extracts security system specific mount options and verifies no changes
 *      are being made to those options.
 *      @sb superblock being remounted
 *      @data contains the filesystem-specific data.
@@ -380,15 +380,15 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      Return 0 if permission is granted.
 * @inode_mkdir:
 *      Check permissions to create a new directory in the existing directory
- *      associated with inode strcture @dir.
+ *      associated with inode structure @dir.
- *      @dir containst the inode structure of parent of the directory to be created.
+ *      @dir contains the inode structure of parent of the directory to be created.
 *      @dentry contains the dentry structure of new directory.
 *      @mode contains the mode of new directory.
 *      Return 0 if permission is granted.
 * @path_mkdir:
 *      Check permissions to create a new directory in the existing directory
- *      associated with path strcture @path.
+ *      associated with path structure @path.
- *      @dir containst the path structure of parent of the directory
+ *      @dir contains the path structure of parent of the directory
 *      to be created.
 *      @dentry contains the dentry structure of new directory.
 *      @mode contains the mode of new directory.
@@ -578,7 +578,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @file contains the file structure.
 *      @cmd contains the operation to perform.
 *      @arg contains the operational arguments.
- *      Check permission for an ioctl operation on @file.  Note that @arg can
+ *      Check permission for an ioctl operation on @file.  Note that @arg
 *      sometimes represents a user space pointer; in other cases, it may be a
 *      simple integer value.  When @arg represents a user space pointer, it
 *      should never be used by the security module.
@@ -606,7 +606,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      Return 0 if permission is granted.
 * @file_fcntl:
 *      Check permission before allowing the file operation specified by @cmd
- *      from being performed on the file @file.  Note that @arg can sometimes
+ *      from being performed on the file @file.  Note that @arg sometimes
 *      represents a user space pointer; in other cases, it may be a simple
 *      integer value.  When @arg represents a user space pointer, it should
 *      never be used by the security module.
@@ -793,7 +793,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      information can be saved using the eff_cap field of the
 *      netlink_skb_parms structure.  Also may be used to provide fine
 *      grained control over message transmission.
- *      @sk associated sock of task sending the message.,
+ *      @sk associated sock of task sending the message.
 *      @skb contains the sk_buff structure for the netlink message.
 *      Return 0 if the information was successfully saved and message
 *      is allowed to be transmitted.
@@ -1080,9 +1080,9 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      should free it.
 *      @key points to the key to be queried.
 *      @_buffer points to a pointer that should be set to point to the
- *       resulting string (if no label or an error occurs).
+ *      resulting string (if no label or an error occurs).
 *      Return the length of the string (including terminating NUL) or -ve if
- *      an error.
+ *      an error.
 *      May also return 0 (and a NULL buffer pointer) if there is no label.
 *
 * Security hooks affecting all System V IPC operations.
@@ -1268,7 +1268,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      credentials.
 *      @tsk contains the task_struct for the process.
 *      @cred contains the credentials to use.
- *      @ns contains the user namespace we want the capability in
+ *      @ns contains the user namespace we want the capability in
 *      @cap contains the capability <include/linux/capability.h>.
 *      @audit: Whether to write an audit message or not
 *      Return 0 if the capability is granted for @tsk.
@@ -1370,7 +1370,7 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts)
 *      @ctxlen contains the length of @ctx.
 *
 * @inode_getsecctx:
- *      Returns a string containing all relavent security context information
+ *      Returns a string containing all relevant security context information
 *
 *      @inode we wish to get the security context of.
 *      @ctx is a pointer in which to place the allocated security context.
diff --git a/include/linux/types.h b/include/linux/types.h
index f0ac9bda0f78..e5fa50345516 100644
--- a/include/linux/types.h
+++ b/include/linux/types.h
@@ -189,7 +189,7 @@ typedef __u32 __bitwise __wsum;
 * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid
 * common 32/64-bit compat problems.
 * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other
- * architectures) and to 8-byte boundaries on 64-bit architetures.  The new
+ * architectures) and to 8-byte boundaries on 64-bit architectures.  The new
 * aligned_64 type enforces 8-byte alignment so that structs containing
 * aligned_64 values have the same alignment on 32-bit and 64-bit architectures.
 * No conversions are necessary between 32-bit user-space and a 64-bit kernel.
diff --git a/include/linux/wanrouter.h b/include/linux/wanrouter.h
index e0aa39612eba..3157cc1fada6 100644
--- a/include/linux/wanrouter.h
+++ b/include/linux/wanrouter.h
@@ -309,7 +309,7 @@ typedef struct wandev_conf
 #define WANOPT_EVEN     2
 /* CHDLC Protocol Options */
-/* DF Commmented out for now.
+/* DF Commented out for now.
 #define WANOPT_CHDLC_NO_DCD             IGNORE_DCD_FOR_LINK_STAT
 #define WANOPT_CHDLC_NO_CTS             IGNORE_CTS_FOR_LINK_STAT
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 2a7523edd9b5..d49928ba5d09 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1439,7 +1439,7 @@ void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
 * DOC: Beacon filter support
 *
 * Some hardware have beacon filter support to reduce host cpu wakeups
- * which will reduce system power consumption. It usuallly works so that
+ * which will reduce system power consumption. It usually works so that
 * the firmware creates a checksum of the beacon but omits all constantly
 * changing elements (TSF, TIM etc). Whenever the checksum changes the
 * beacon is forwarded to the host, otherwise it will be just dropped. That
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 890eb02c2f21..3afc68c08433 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -4,7 +4,7 @@
 *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
 *  Copyright (C) 2008-2011 Red Hat, Inc., Ingo Molnar
 *  Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
- *  Copyright  �  2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
+ *  Copyright  ��  2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
 *
 * For licensing details see kernel-base/COPYING
 */
diff --git a/kernel/events/ring_buffer.c b/kernel/events/ring_buffer.c
index 7f3011c6b57f..6ddaba43fb7a 100644
--- a/kernel/events/ring_buffer.c
+++ b/kernel/events/ring_buffer.c
@@ -4,7 +4,7 @@
 *  Copyright (C) 2008 Thomas Gleixner <tglx@linutronix.de>
 *  Copyright (C) 2008-2011 Red Hat, Inc., Ingo Molnar
 *  Copyright (C) 2008-2011 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com>
- *  Copyright  �  2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
+ *  Copyright  ��  2009 Paul Mackerras, IBM Corp. <paulus@au1.ibm.com>
 *
 * For licensing details see kernel-base/COPYING
 */
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 1da999f5e746..a9a9dbe49fea 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -1292,7 +1292,7 @@ EXPORT_SYMBOL(free_irq);
 *      and to set up the interrupt handler in the right order.
 *
 *      If you want to set up a threaded irq handler for your device
- *      then you need to supply @handler and @thread_fn. @handler ist
+ *      then you need to supply @handler and @thread_fn. @handler is
 *      still called in hard interrupt context and has to check
 *      whether the interrupt originates from the device. If yes it
 *      needs to disable the interrupt on the device and return
diff --git a/kernel/time/Kconfig b/kernel/time/Kconfig
index b26c2228fe92..2cf9cc7aa103 100644
--- a/kernel/time/Kconfig
+++ b/kernel/time/Kconfig
@@ -25,7 +25,7 @@ config HIGH_RES_TIMERS
 config GENERIC_CLOCKEVENTS_BUILD
        bool
        default y
-        depends on GENERIC_CLOCKEVENTS || GENERIC_CLOCKEVENTS_MIGR
+        depends on GENERIC_CLOCKEVENTS
 config GENERIC_CLOCKEVENTS_MIN_ADJUST
        bool
diff --git a/lib/Kconfig b/lib/Kconfig
index 63b5782732ed..f34be6417d71 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -273,10 +273,9 @@ config AVERAGE
          If unsure, say N.
 config CORDIC
-        tristate "Cordic function"
+        tristate "CORDIC algorithm"
        help
-          The option provides arithmetic function using cordic algorithm
+          This option provides an implementation of the CORDIC algorithm;
-          so its calculations are in fixed point. Modules can select this
+          calculations are in fixed point. Module will be called cordic.
-          when they require this function. Module will be called cordic.
 endmenu
diff --git a/lib/cordic.c b/lib/cordic.c
index aa27a88d7e04..6cf477839ebd 100644
--- a/lib/cordic.c
+++ b/lib/cordic.c
@@ -96,6 +96,6 @@ struct cordic_iq cordic_calc_iq(s32 theta)
 }
 EXPORT_SYMBOL(cordic_calc_iq);
-MODULE_DESCRIPTION("Cordic functions");
+MODULE_DESCRIPTION("CORDIC algorithm");
 MODULE_AUTHOR("Broadcom Corporation");
 MODULE_LICENSE("Dual BSD/GPL");
diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
index a7b80c1d6a0d..31c5f7675fbf 100644
--- a/lib/decompress_bunzip2.c
+++ b/lib/decompress_bunzip2.c
@@ -1,4 +1,3 @@
-/* vi: set sw = 4 ts = 4: */
 /*      Small bzip2 deflate implementation, by Rob Landley (rob@landley.net).
        Based on bzip2 decompression code by Julian R Seward (jseward@acm.org),
@@ -691,7 +690,7 @@ STATIC int INIT bunzip2(unsigned char *buf, int len,
                outbuf = malloc(BZIP2_IOBUF_SIZE);
        if (!outbuf) {
-                error("Could not allocate output bufer");
+                error("Could not allocate output buffer");
                return RETVAL_OUT_OF_MEMORY;
        }
        if (buf)
@@ -699,7 +698,7 @@ STATIC int INIT bunzip2(unsigned char *buf, int len,
        else
                inbuf = malloc(BZIP2_IOBUF_SIZE);
        if (!inbuf) {
-                error("Could not allocate input bufer");
+                error("Could not allocate input buffer");
                i = RETVAL_OUT_OF_MEMORY;
                goto exit_0;
        }
diff --git a/lib/decompress_unlzma.c b/lib/decompress_unlzma.c
index 476c65af9709..32adb73a9038 100644
--- a/lib/decompress_unlzma.c
+++ b/lib/decompress_unlzma.c
@@ -562,7 +562,7 @@ STATIC inline int INIT unlzma(unsigned char *buf, int in_len,
        else
                inbuf = malloc(LZMA_IOBUF_SIZE);
        if (!inbuf) {
-                error("Could not allocate input bufer");
+                error("Could not allocate input buffer");
                goto exit_0;
        }
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f24bc1c40080..7990ca154d1b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -311,8 +311,8 @@ out:
 *
 * The remaining PAGE_SIZE pages are called "tail pages".
 *
- * All pages have PG_compound set.  All pages have their ->private pointing at
+ * All pages have PG_compound set.  All tail pages have their ->first_page
- * the head page (even the head page has this).
+ * pointing at the head page.
 *
 * The first tail page's ->lru.next holds the address of the compound page's
 * put_page() function.  Its ->lru.prev holds the order of allocation.
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig
index 1a8f93bd2d4f..335ca7abbd46 100644
--- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig
@@ -163,8 +163,6 @@ config IP_PNP_RARP
          operating on your network. Read
          <file:Documentation/filesystems/nfs/nfsroot.txt> for details.
-# not yet ready..
-#   bool '    IP: ARP support' CONFIG_IP_PNP_ARP
 config NET_IPIP
        tristate "IP: tunneling"
        select INET_TUNNEL
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index fdaabf2f2b68..1f23a57aa9e6 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -392,7 +392,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
        /* Is this the final fragment? */
        if ((flags & IP_MF) == 0) {
                /* If we already have some bits beyond end
-                 * or have different end, the segment is corrrupted.
+                 * or have different end, the segment is corrupted.
                 */
                if (end < qp->q.len ||
                    ((qp->q.last_in & INET_FRAG_LAST_IN) && end != qp->q.len))
diff --git a/net/ipv4/netfilter/nf_nat_core.c b/net/ipv4/netfilter/nf_nat_core.c
index acdd002bb540..a708933dc230 100644
--- a/net/ipv4/netfilter/nf_nat_core.c
+++ b/net/ipv4/netfilter/nf_nat_core.c
@@ -317,7 +317,7 @@ nf_nat_setup_info(struct nf_conn *ct,
                srchash = hash_by_src(net, nf_ct_zone(ct),
                                      &ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple);
                spin_lock_bh(&nf_nat_lock);
-                /* nf_conntrack_alter_reply might re-allocate exntension aera */
+                /* nf_conntrack_alter_reply might re-allocate extension area */
                nat = nfct_nat(ct);
                nat->ct = ct;
                hlist_add_head_rcu(&nat->bysource,
diff --git a/net/netfilter/ipvs/Kconfig b/net/netfilter/ipvs/Kconfig
index af4c0b8c5275..f9871385a65e 100644
--- a/net/netfilter/ipvs/Kconfig
+++ b/net/netfilter/ipvs/Kconfig
@@ -122,7 +122,6 @@ config	IP_VS_RR
 
 config  IP_VS_WRR
        tristate "weighted round-robin scheduling"
-        select GCD
        ---help---
          The weighted robin-robin scheduling algorithm directs network
          connections to different real servers based on server weights
diff --git a/net/sctp/endpointola.c b/net/sctp/endpointola.c
index c8cc24e282c3..68a385d7c3bd 100644
--- a/net/sctp/endpointola.c
+++ b/net/sctp/endpointola.c
@@ -415,7 +415,7 @@ static void sctp_endpoint_bh_rcv(struct work_struct *work)
        sctp_subtype_t subtype;
        sctp_state_t state;
        int error = 0;
-        int first_time = 1;     /* is this the first time through the looop */
+        int first_time = 1;     /* is this the first time through the loop */
        if (ep->base.dead)
                return;
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index bc6aa003860e..87bf08076b11 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -141,7 +141,7 @@ perf-%pkg: FORCE
 help: FORCE
        @echo '  rpm-pkg             - Build both source and binary RPM kernel packages'
        @echo '  binrpm-pkg          - Build only the binary kernel package'
-        @echo '  deb-pkg             - Build the kernel as an deb package'
+        @echo '  deb-pkg             - Build the kernel as a deb package'
        @echo '  tar-pkg             - Build the kernel as an uncompressed tarball'
        @echo '  targz-pkg           - Build the kernel as a gzip compressed tarball'
        @echo '  tarbz2-pkg          - Build the kernel as a bzip2 compressed tarball'
diff --git a/sound/aoa/codecs/Kconfig b/sound/aoa/codecs/Kconfig
index 808eb11ebacd..0c68e32834c3 100644
--- a/sound/aoa/codecs/Kconfig
+++ b/sound/aoa/codecs/Kconfig
@@ -7,14 +7,6 @@ config SND_AOA_ONYX
        codec chip found in the latest Apple machines
        (most of those with digital audio output).
-#config SND_AOA_TOPAZ
-#       tristate "support Topaz chips"
-#       ---help---
-#       This option enables support for the Topaz (CS84xx)
-#       codec chips found in the latest Apple machines,
-#       these chips do the digital input and output on
-#       some PowerMacs.
 config SND_AOA_TAS
        tristate "support TAS chips"
        select I2C
diff --git a/sound/core/Kconfig b/sound/core/Kconfig
index 475455c76610..c15682a2f9db 100644
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -5,7 +5,6 @@ config SND_TIMER
 config SND_PCM
        tristate
        select SND_TIMER
-        select GCD
 config SND_HWDEP
        tristate
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 6c9e8e8f45f8..5849b129e50d 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -521,7 +521,7 @@ config SC6600_CDROMBASE
 config SOUND_VIDC
        tristate "VIDC 16-bit sound"
-        depends on ARM && (ARCH_ACORN || ARCH_CLPS7500)
+        depends on ARM && ARCH_ACORN
        help
          16-bit support for the VIDC onboard sound hardware found on Acorn
          machines.
diff --git a/tools/power/x86/turbostat/turbostat.8 b/tools/power/x86/turbostat/turbostat.8
index ff75125deed0..555c69a5592a 100644
--- a/tools/power/x86/turbostat/turbostat.8
+++ b/tools/power/x86/turbostat/turbostat.8
@@ -38,8 +38,8 @@ displays the statistics gathered since it was forked.
 .PP
 .SH FIELD DESCRIPTIONS
 .nf
-\fBpkg\fP processor package number.
+\fBpk\fP processor package number.
-\fBcore\fP processor core number.
+\fBcr\fP processor core number.
 \fBCPU\fP Linux CPU (logical processor) number.
 \fB%c0\fP percent of the interval that the CPU retired instructions.
 \fBGHz\fP average clock rate while the CPU was in c0 state.
@@ -58,7 +58,7 @@ Subsequent rows show per-CPU statistics.
 .nf
 [root@x980]# ./turbostat
-core CPU   %c0   GHz  TSC   %c1    %c3    %c6   %pc3   %pc6
+cr   CPU   %c0   GHz  TSC   %c1    %c3    %c6   %pc3   %pc6
          0.04 1.62 3.38   0.11   0.00  99.85   0.00  95.07
  0   0   0.04 1.62 3.38   0.06   0.00  99.90   0.00  95.07
  0   6   0.02 1.62 3.38   0.08   0.00  99.90   0.00  95.07
@@ -102,7 +102,7 @@ until ^C while the other CPUs are mostly idle:
 .nf
 [root@x980 lenb]# ./turbostat cat /dev/zero > /dev/null
-^Ccore CPU   %c0   GHz  TSC   %c1    %c3    %c6   %pc3   %pc6
+^Ccr   CPU   %c0   GHz  TSC   %c1    %c3    %c6   %pc3   %pc6
           8.49 3.63 3.38  16.23   0.66  74.63   0.00   0.00
   0   0   1.22 3.62 3.38  32.18   0.00  66.60   0.00   0.00
   0   6   0.40 3.61 3.38  33.00   0.00  66.60   0.00   0.00
diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
index dbedfa196727..553c06b7d6f2 100644
--- a/tools/testing/ktest/sample.conf
+++ b/tools/testing/ktest/sample.conf
@@ -950,7 +950,7 @@
 #   TEST_START
 #   TEST_TYPE = config_bisect
 #   CONFIG_BISECT_TYPE = build
-#   CONFIG_BISECT = /home/test/�onfig-bad
+#   CONFIG_BISECT = /home/test/config-bad
 #   MIN_CONFIG = /home/test/config-min
 #   BISECT_MANUAL = 1
 #