diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /fs/signalfd.c | |
parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'fs/signalfd.c')
-rw-r--r-- | fs/signalfd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/signalfd.c b/fs/signalfd.c index fb7f7e8034df..2d3e107da2d3 100644 --- a/fs/signalfd.c +++ b/fs/signalfd.c | |||
@@ -66,7 +66,7 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, | |||
66 | BUILD_BUG_ON(sizeof(struct signalfd_siginfo) != 128); | 66 | BUILD_BUG_ON(sizeof(struct signalfd_siginfo) != 128); |
67 | 67 | ||
68 | /* | 68 | /* |
69 | * Unused memebers should be zero ... | 69 | * Unused members should be zero ... |
70 | */ | 70 | */ |
71 | err = __clear_user(uinfo, sizeof(*uinfo)); | 71 | err = __clear_user(uinfo, sizeof(*uinfo)); |
72 | 72 | ||