projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'master-2014-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...
[cascardo/linux.git]
/
fs
/
ubifs
/
io.c
diff --git
a/fs/ubifs/io.c
b/fs/ubifs/io.c
index
2290d58
..
fb08b0c
100644
(file)
--- a/
fs/ubifs/io.c
+++ b/
fs/ubifs/io.c
@@
-431,7
+431,7
@@
void ubifs_prep_grp_node(struct ubifs_info *c, void *node, int len, int last)
/**
* wbuf_timer_callback - write-buffer timer callback function.
- * @
data
: timer data (write-buffer descriptor)
+ * @
timer
: timer data (write-buffer descriptor)
*
* This function is called when the write-buffer timer expires.
*/