err.no Git - linux-2.6/commit

author	Trond Myklebust <Trond.Myklebust@netapp.com>
	Tue, 15 Jul 2008 22:34:16 +0000 (18:34 -0400)
committer	Trond Myklebust <Trond.Myklebust@netapp.com>
	Tue, 15 Jul 2008 22:34:16 +0000 (18:34 -0400)
commit	e89e896d31b11a51a54ddcd3f72a76bd286dd86c
tree	105a9a93a4021caeeba76e479778ad2dd2b87b57	tree \| snapshot
parent	3a628b0fd42f7eaf9d052447784d48ceae9ffb8e	commit \| diff
parent	d67d1c7bf948341fd8678c8e337ec27f4b46b206	commit \| diff

Merge branch 'devel' into next

Conflicts:

fs/nfs/file.c

Fix up the conflict with Jon Corbet's bkl-removal tree

fs/Kconfig	diff1 \|	diff2 \|	blob \| history
fs/nfs/file.c	diff1 \|	diff2 \|	blob \| history