git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 1b0a906)
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Sep 2012 21:52:49 +0000 (05:52 +0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Sep 2012 21:52:49 +0000 (05:52 +0800)
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

fs/cifs/file.c patch | blob | history
fs/cifs/smb2pdu.h patch | blob | history

diff --cc fs/cifs/file.c
Simple merge
diff --cc fs/cifs/smb2pdu.h
Simple merge
Pandora Kernel Repository