summaryrefslogtreecommitdiffstats
path: root/fs/lockd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-09-18 05:58:11 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-18 05:58:11 +0200
commitca043a66ae48c74fa628ec92178f7a54f5b9a106 (patch)
tree37e9019bb99ed0f59debc426456e71befd4b7a9c /fs/lockd
parentMerge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff)
parentMerge branch 'x86/pat' into x86/urgent (diff)
downloadlinux-ca043a66ae48c74fa628ec92178f7a54f5b9a106.tar.xz
linux-ca043a66ae48c74fa628ec92178f7a54f5b9a106.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, pat: don't use rb-tree based lookup in reserve_memtype() x86: Increase MIN_GAP to include randomized stack
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions