summaryrefslogtreecommitdiffstats
path: root/arch/m32r/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 07:58:03 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-02-04 07:58:03 -0800
commit9853832c49dc1685587abeb4e1decd4be690d256 (patch)
tree13510327f85b8d8c238728b47ae74e0fa5299e17 /arch/m32r/Kconfig
parentb21761ff18c0eba67e8f2886b3c0b9cae79b5249 (diff)
parentab1f16116527e42dec8aee176d673a41a881b809 (diff)
Merge branch 'locks' of git://linux-nfs.org/~bfields/linux
* 'locks' of git://linux-nfs.org/~bfields/linux: pid-namespaces-vs-locks-interaction file locks: Use wait_event_interruptible_timeout() locks: clarify posix_locks_deadlock
Diffstat (limited to 'arch/m32r/Kconfig')
0 files changed, 0 insertions, 0 deletions