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)
commite9bd8f1624cb0f647867d6cced79cb26ef3651bf
tree89d9d7b02644823d54a6b244aeb89d46028c5eac
parent1b0a9069dec4168b431755ca89c6999d7c46a7de
parentb2ede58e98c87c7f0f44a926f974262f65c3402f
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