aboutsummaryrefslogtreecommitdiff
path: root/fs/cifs/cifsproto.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-05-28 16:35:52 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-05-28 16:35:52 -0700
commitd9ec5ad24ce80b7ef69a0717363db661d13aada5 (patch)
tree0a808684e7d5e61427ccd0ecb7f3849164a32aef /fs/cifs/cifsproto.h
parentb82e8005af14b51600714971e0c6420c4e334a50 (diff)
parent0737ac895afbfbe210557fa5fbafcca932d5fa7c (diff)
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] the latest consensus libata resume fix
Diffstat (limited to 'fs/cifs/cifsproto.h')
0 files changed, 0 insertions, 0 deletions