summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-10 14:53:11 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-10 14:53:11 +1200
commit65112dccf8a113737684366349d7f9ec373ddc47 (patch)
tree4aaaffb4cfd48954ba8e0c174a2a963ad012295a /drivers/ide
parentbbf5e9743fd6c9b4ef8a34db8a9502baf4191524 (diff)
parent9d1e397b7bafe843564eab26ed3f682637159c6c (diff)
downloadlinux-65112dccf8a113737684366349d7f9ec373ddc47.tar.bz2
Merge git://git.samba.org/sfrench/cifs-2.6
* git://git.samba.org/sfrench/cifs-2.6: [CIFS] Fix first time message on mount, ntlmv2 upgrade delayed to 3.2
Diffstat (limited to 'drivers/ide')
0 files changed, 0 insertions, 0 deletions