diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-27 20:56:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-27 20:56:54 -0700 |
| commit | c629eaf8392b676b4f83c3dc344e66402bfeec92 (patch) | |
| tree | 5edd51bb94b7b83ddf3c3c2793c0a6a1ac671e9c /arch/um | |
| parent | 4bbbf13fd55a9817452533934dee489683e703b8 (diff) | |
| parent | 28f8881023c9713c303c0feda270929f9384c019 (diff) | |
Merge git://git.samba.org/sfrench/cifs-2.6
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
Diffstat (limited to 'arch/um')
0 files changed, 0 insertions, 0 deletions