summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-09 19:30:19 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-09 19:30:19 +0100
commit896abeb743579fc8be0d16d15d6768a158a3a109 (patch)
tree8b5f6ce348ea00e5f67de8f67001fdbfd248de32 /arch/x86/kernel
parenti915: Fix more size_t format string warnings (diff)
parentlockd: fix regression in lockd's handling of blocked locks (diff)
downloadlinux-896abeb743579fc8be0d16d15d6768a158a3a109.tar.xz
linux-896abeb743579fc8be0d16d15d6768a158a3a109.zip
Merge branch 'for-2.6.29' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux: lockd: fix regression in lockd's handling of blocked locks
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions