diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-12 23:53:34 -0700 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-12 23:53:34 -0700 |
commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /fs/Kconfig | |
parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
download | kernel_samsung_smdk4412-c170093d31bd4e3bc51881cc0f123beeca7872c9.zip kernel_samsung_smdk4412-c170093d31bd4e3bc51881cc0f123beeca7872c9.tar.gz kernel_samsung_smdk4412-c170093d31bd4e3bc51881cc0f123beeca7872c9.tar.bz2 |
Merge branch 'devicetree/merge' into spi/merge
Diffstat (limited to 'fs/Kconfig')
-rw-r--r-- | fs/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -50,7 +50,7 @@ config EXPORTFS tristate config FILE_LOCKING - bool "Enable POSIX file locking API" if EMBEDDED + bool "Enable POSIX file locking API" if EXPERT default y help This option enables standard file locking support, required |