summaryrefslogtreecommitdiffstats
path: root/fs/cifs/dir.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-26 20:10:56 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-26 20:10:56 +0200
commitaebdd82e18c38258fe84ea080a43c098e826ef63 (patch)
tree29172b6857b184d643981b246bcd653cbd8648df /fs/cifs/dir.c
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg... (diff)
parentktest: Fix bug when ADD_CONFIG is set but MIN_CONFIG is not (diff)
downloadlinux-aebdd82e18c38258fe84ea080a43c098e826ef63.tar.xz
linux-aebdd82e18c38258fe84ea080a43c098e826ef63.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-ktest: ktest: Fix bug when ADD_CONFIG is set but MIN_CONFIG is not ktest: Keep fonud configs separate from default configs ktest: Add prompt to use OUTPUT_MIN_CONFIG ktest: Use Kconfig dependencies to shorten time to make min_config ktest: Add test type make_min_config ktest: Require one TEST_START in config file ktest: Add helper function to avoid duplicate code ktest: Add IGNORE_WARNINGS to ignore warnings in some patches ktest: Fix tar extracting of modules to target ktest: Have the testing tmp dir include machine name ktest: Add POST/PRE_BUILD options ktest: Allow initrd processing without modules defined ktest: Have LOG_FILE evaluate options as well ktest: Have wait on stdio honor bug timeout ktest: Implement our own force min config ktest: Add TEST_NAME option ktest: Add CONFIG_BISECT_GOOD option ktest: Add detection of triple faults ktest: Notify reason to break out of monitoring boot
Diffstat (limited to 'fs/cifs/dir.c')
0 files changed, 0 insertions, 0 deletions