git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff

]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 9 Feb 2009 18:30:19 +0000 (10:30 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Mon, 9 Feb 2009 18:30:19 +0000 (10:30 -0800)

* 'for-2.6.29' of git://linux-nfs.org/~bfields/linux:
lockd: fix regression in lockd's handling of blocked locks

Trivial merge

Ubuntu Eoan Linux kernel mirror