summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/00-INDEX4
-rw-r--r--Documentation/ABI/obsolete/sysfs-class-rfkill2
-rw-r--r--Documentation/ABI/stable/sysfs-module2
-rw-r--r--Documentation/DocBook/filesystems.tmpl2
-rw-r--r--Documentation/DocBook/libata.tmpl8
-rw-r--r--Documentation/DocBook/media/v4l/compat.xml4
-rw-r--r--Documentation/arm/kernel_user_helpers.txt2
-rw-r--r--Documentation/cgroups/blkio-controller.txt18
-rw-r--r--Documentation/device-mapper/dm-raid.txt2
-rw-r--r--Documentation/device-mapper/persistent-data.txt2
-rw-r--r--Documentation/device-mapper/thin-provisioning.txt2
-rw-r--r--Documentation/devicetree/bindings/arm/omap/omap.txt2
-rw-r--r--Documentation/devicetree/bindings/arm/sirf.txt2
-rw-r--r--Documentation/devicetree/booting-without-of.txt2
-rw-r--r--Documentation/dmaengine.txt2
-rw-r--r--Documentation/fb/matroxfb.txt8
-rw-r--r--Documentation/filesystems/ext4.txt4
-rw-r--r--Documentation/filesystems/gfs2-uevents.txt2
-rw-r--r--Documentation/filesystems/pohmelfs/network_protocol.txt2
-rw-r--r--Documentation/filesystems/ramfs-rootfs-initramfs.txt2
-rw-r--r--Documentation/filesystems/vfs.txt2
-rw-r--r--Documentation/hwmon/adm12752
-rw-r--r--Documentation/hwmon/max160644
-rw-r--r--Documentation/hwmon/max344404
-rw-r--r--Documentation/hwmon/max86884
-rw-r--r--Documentation/hwmon/ucd90006
-rw-r--r--Documentation/hwmon/ucd920010
-rw-r--r--Documentation/hwmon/zl61004
-rw-r--r--Documentation/i2o/ioctl12
-rw-r--r--Documentation/ide/ChangeLog.ide-cd.1994-20042
-rw-r--r--Documentation/input/alps.txt4
-rw-r--r--Documentation/input/joystick.txt2
-rw-r--r--Documentation/ioctl/hdio.txt4
-rw-r--r--Documentation/kbuild/kconfig-language.txt2
-rw-r--r--Documentation/kernel-parameters.txt6
-rw-r--r--Documentation/networking/fore200e.txt2
-rw-r--r--Documentation/numastat.txt27
-rw-r--r--Documentation/scsi/ChangeLog.lpfc2
-rw-r--r--Documentation/scsi/ChangeLog.megaraid_sas2
-rw-r--r--Documentation/scsi/scsi-generic.txt2
-rw-r--r--Documentation/scsi/tmscsim.txt2
-rw-r--r--Documentation/security/Smack.txt2
-rw-r--r--Documentation/security/keys-trusted-encrypted.txt2
-rw-r--r--Documentation/security/keys.txt2
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt2
-rwxr-xr-xDocumentation/target/tcm_mod_builder.py2
-rw-r--r--Documentation/trace/events-power.txt2
-rw-r--r--Documentation/usb/mtouchusb.txt2
-rw-r--r--Documentation/usb/power-management.txt2
-rw-r--r--Documentation/usb/proc_usb_info.txt2
-rw-r--r--Documentation/video4linux/uvcvideo.txt2
-rw-r--r--Documentation/virtual/kvm/mmu.txt4
-rw-r--r--Documentation/virtual/virtio-spec.txt8
-rw-r--r--Documentation/vm/cleancache.txt2
-rw-r--r--Documentation/vm/unevictable-lru.txt8
-rw-r--r--Documentation/watchdog/watchdog-kernel-api.txt2
-rw-r--r--arch/alpha/include/asm/machvec.h2
-rw-r--r--arch/alpha/kernel/sys_dp264.c2
-rw-r--r--arch/arm/mach-bcmring/dma.c1
-rw-r--r--arch/arm/mach-ks8695/leds.c1
-rw-r--r--arch/arm/mach-omap1/lcd_dma.c2
-rw-r--r--arch/arm/mach-orion5x/db88f5281-setup.c4
-rw-r--r--arch/arm/mach-orion5x/rd88f5182-setup.c4
-rw-r--r--arch/arm/mach-spear3xx/spear300.c2
-rw-r--r--arch/arm/mach-spear3xx/spear310.c2
-rw-r--r--arch/arm/mach-spear3xx/spear320.c2
-rw-r--r--arch/arm/mm/init.c1
-rw-r--r--arch/arm/plat-s3c24xx/pm-simtec.c2
-rw-r--r--arch/ia64/xen/irq_xen.c2
-rw-r--r--arch/mips/bcm63xx/setup.c2
-rw-r--r--arch/powerpc/include/asm/keylargo.h2
-rw-r--r--arch/score/Kconfig.debug2
-rw-r--r--arch/x86/platform/scx200/scx200_32.c24
-rw-r--r--drivers/block/nvme.c1
-rw-r--r--drivers/char/nvram.c2
-rw-r--r--drivers/char/rtc.c4
-rw-r--r--drivers/char/tpm/tpm_tis.c10
-rw-r--r--drivers/dma/iop-adma.c2
-rw-r--r--drivers/gpu/drm/gma500/psb_intel_lvds.c9
-rw-r--r--drivers/gpu/drm/radeon/rv515.c4
-rw-r--r--drivers/gpu/drm/vmwgfx/vmwgfx_drv.c2
-rw-r--r--drivers/hwmon/tmp401.c2
-rw-r--r--drivers/infiniband/ulp/srpt/ib_srpt.c2
-rw-r--r--drivers/iommu/intel-iommu.c2
-rw-r--r--drivers/macintosh/mediabay.c2
-rw-r--r--drivers/md/dm-bufio.c1
-rw-r--r--drivers/media/dvb/dvb-usb/lmedm04.c2
-rw-r--r--drivers/media/dvb/frontends/drxk_hard.c1
-rw-r--r--drivers/media/dvb/frontends/tda1004x.c4
-rw-r--r--drivers/media/dvb/mantis/mantis_hif.c2
-rw-r--r--drivers/media/radio/radio-sf16fmr2.c2
-rw-r--r--drivers/media/video/davinci/dm355_ccdc.c2
-rw-r--r--drivers/media/video/ov6650.c2
-rw-r--r--drivers/mfd/ab5500-core.c1
-rw-r--r--drivers/mmc/host/s3cmci.c4
-rw-r--r--drivers/mtd/chips/chipreg.c5
-rw-r--r--drivers/net/wireless/hostap/hostap_hw.c4
-rw-r--r--drivers/net/wireless/zd1211rw/zd_mac.c2
-rw-r--r--drivers/net/wireless/zd1211rw/zd_usb.c2
-rw-r--r--drivers/platform/x86/hdaps.c4
-rw-r--r--drivers/power/bq27x00_battery.c4
-rw-r--r--drivers/scsi/aic7xxx/aic79xx_core.c4
-rw-r--r--drivers/scsi/aic7xxx/aic7xxx_core.c2
-rw-r--r--drivers/scsi/isci/host.c1
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_config.c2
-rw-r--r--drivers/scsi/pm8001/pm8001_hwi.c2
-rw-r--r--drivers/scsi/pmcraid.h6
-rw-r--r--drivers/scsi/qla2xxx/qla_bsg.c2
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c4
-rw-r--r--drivers/staging/iio/dac/ad5686.c1
-rw-r--r--drivers/tty/synclink_gt.c2
-rw-r--r--fs/btrfs/check-integrity.c1
-rw-r--r--fs/btrfs/free-space-cache.c2
-rw-r--r--fs/cramfs/inode.c6
-rw-r--r--fs/fs-writeback.c2
-rw-r--r--fs/jffs2/compr.c2
-rw-r--r--fs/ntfs/layout.h4
-rw-r--r--fs/proc/kcore.c2
-rw-r--r--fs/reiserfs/lbalance.c2
-rw-r--r--include/linux/compiler.h2
-rw-r--r--include/linux/pci.h12
-rw-r--r--include/linux/security.h2
-rw-r--r--include/linux/writeback.h2
-rw-r--r--include/trace/events/power.h1
-rw-r--r--init/main.c4
-rw-r--r--kernel/resource.c3
-rw-r--r--mm/truncate.c2
-rw-r--r--net/rds/ib_recv.c2
-rw-r--r--net/rds/iw_recv.c2
-rw-r--r--sound/pci/hda/patch_conexant.c2
-rwxr-xr-xtools/testing/ktest/ktest.pl2
131 files changed, 217 insertions, 230 deletions
diff --git a/Documentation/00-INDEX b/Documentation/00-INDEX
index 65bbd2622396..a1a643272883 100644
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
@@ -7,8 +7,8 @@ Please try and keep the descriptions small enough to fit on one line.
Following translations are available on the WWW:
- - Japanese, maintained by the JF Project (JF@linux.or.jp), at
- http://www.linux.or.jp/JF/
+ - Japanese, maintained by the JF Project (jf@listserv.linux.or.jp), at
+ http://linuxjf.sourceforge.jp/
00-INDEX
- this file.
diff --git a/Documentation/ABI/obsolete/sysfs-class-rfkill b/Documentation/ABI/obsolete/sysfs-class-rfkill
index 4201d5b05515..ff60ad9eca4c 100644
--- a/Documentation/ABI/obsolete/sysfs-class-rfkill
+++ b/Documentation/ABI/obsolete/sysfs-class-rfkill
@@ -7,7 +7,7 @@ Date: 09-Jul-2007
KernelVersion v2.6.22
Contact: linux-wireless@vger.kernel.org
Description: Current state of the transmitter.
- This file is deprecated and sheduled to be removed in 2014,
+ This file is deprecated and scheduled to be removed in 2014,
because its not possible to express the 'soft and hard block'
state of the rfkill driver.
Values: A numeric value.
diff --git a/Documentation/ABI/stable/sysfs-module b/Documentation/ABI/stable/sysfs-module
index 75be43118335..a0dd21c6db59 100644
--- a/Documentation/ABI/stable/sysfs-module
+++ b/Documentation/ABI/stable/sysfs-module
@@ -6,7 +6,7 @@ Description:
The name of the module that is in the kernel. This
module name will show up either if the module is built
directly into the kernel, or if it is loaded as a
- dyanmic module.
+ dynamic module.
/sys/module/MODULENAME/parameters
This directory contains individual files that are each
diff --git a/Documenta