diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 00:22:25 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 00:22:25 +0300 |
| commit | 69c4289449b954f87ce33904bbb1b27dc075dcfa (patch) | |
| tree | 281d93b5b3d65e832e2fe8e7ff77d89a7de7539b /arch | |
| parent | 76d5b28bbad1c5502a24f94c2beafc468690b2ba (diff) | |
| parent | 34df117414d73cb56d128bf7016a4c151f95c313 (diff) | |
| download | linux-69c4289449b954f87ce33904bbb1b27dc075dcfa.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
fat: fix error message for bogus number of directory entries
fat: fix typo s/supeblock/superblock/
ASoC: max9877: Remove unused function declaration
dw2102: don't output spurious blank lines to the kernel log
init: fix Kconfig text
ARM: io: fix comment grammar
ocfs: fix ocfs2_xattr_user_get() argument name
scsi/qla2xxx: Remove erroneous unused macro qla82xx_get_temp_val1()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index 781ef5fe235d..021692c64de3 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -282,7 +282,7 @@ extern void _memset_io(volatile void __iomem *, int, size_t); * These perform PCI memory accesses via an ioremap region. They don't * take an address as such, but a cookie. * - * Again, this are defined to perform little endian accesses. See the + * Again, these are defined to perform little endian accesses. See the * IO port primitives for more information. */ #ifndef readl |