| commit | bf2785a818372603ad3ca3abcab65010f08a1d68 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 04 15:00:58 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 04 15:00:58 2012 -0700 |
| tree | 8217f81fbfb686c006ade225d479c9000c311e7a | |
| parent | a3fe778c7895cd847d23c25ad566d83346282a77 [diff] | |
| parent | 88257360605f9362dc4d79326c268dd334f61c90 [diff] |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 Pull cifs fixes from Steve French. * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: CIFS: Move get_next_mid to ops struct CIFS: Make accessing is_valid_oplock/dump_detail ops struct field safe CIFS: Improve identation in cifs_unlock_range CIFS: Fix possible wrong memory allocation