summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-16 12:47:11 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-16 12:47:11 -0700
commitb41a080fa9f157d223c782ec3571cf46e34e91d6 (patch)
tree2aaba1eefe54c74b7a9e9ea02c3db9a01b3ad648 /fs/cifs
parent5fe4990a97ef340046117aceb02bcad01644ebc2 (diff)
parentd8788298d491ee5026981eb751b0341a996b22e4 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: piix: The Sony TZ90 needs the cable type hardcoding icside: register second channel of version 6 PCB ide-tape: remove back-to-back REQUEST_SENSE detection
Diffstat (limited to 'fs/cifs')
0 files changed, 0 insertions, 0 deletions