diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-11 05:52:49 +0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-11 05:52:49 +0800 |
| commit | e9bd8f1624cb0f647867d6cced79cb26ef3651bf (patch) | |
| tree | 89d9d7b02644823d54a6b244aeb89d46028c5eac /fs/reiserfs/journal.c | |
| parent | 1b0a9069dec4168b431755ca89c6999d7c46a7de (diff) | |
| parent | b2ede58e98c87c7f0f44a926f974262f65c3402f (diff) | |
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French.
* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
CIFS: Fix endianness conversion
CIFS: Fix error handling in cifs_push_mandatory_locks
Diffstat (limited to 'fs/reiserfs/journal.c')
0 files changed, 0 insertions, 0 deletions