summaryrefslogtreecommitdiffstats
path: root/fs/cifs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-16 21:22:52 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-16 21:22:52 +0100
commit237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8 (patch)
tree8bc42df168da6bd8545e90487f1f7c324aba486c /fs/cifs
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff)
parent[ARM] Remove OP_MAX_COUNTER (diff)
downloadlinux-237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8.tar.xz
linux-237ee312e10a86e69e01fc02e0daeb0fa3e7a6e8.zip
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] Remove OP_MAX_COUNTER [ARM] Remove PM_LEGACY=y from selected ARM defconfigs [ARM] 3857/2: pnx4008: add devices' registration
Diffstat (limited to 'fs/cifs')
0 files changed, 0 insertions, 0 deletions