summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-10 23:52:49 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-10 23:52:49 +0200
commite9bd8f1624cb0f647867d6cced79cb26ef3651bf (patch)
tree89d9d7b02644823d54a6b244aeb89d46028c5eac /drivers/ata
parentMerge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff)
parentCIFS: Fix endianness conversion (diff)
downloadlinux-e9bd8f1624cb0f647867d6cced79cb26ef3651bf.tar.xz
linux-e9bd8f1624cb0f647867d6cced79cb26ef3651bf.zip
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 'drivers/ata')
0 files changed, 0 insertions, 0 deletions