OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4bbbf13
28f8881
)
Merge git://git.samba.org/sfrench/cifs-2.6
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 28 Apr 2012 03:56:54 +0000
(20:56 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 28 Apr 2012 03:56:54 +0000
(20:56 -0700)
Pull CIFS fixes from Steve French.
* git://git.samba.org/sfrench/cifs-2.6:
Use correct conversion specifiers in cifs_show_options
CIFS: Show backupuid/gid in /proc/mounts
cifs: fix offset handling in cifs_iovec_write
Trivial merge