From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 15 Jul 2008 22:34:16 +0000 (-0400)
Subject: Merge branch 'devel' into next
X-Git-Tag: v2.6.27-rc1~1052^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e89e896d31b11a51a54ddcd3f72a76bd286dd86c;p=pandora-kernel.git

Merge branch 'devel' into next

Conflicts:

	fs/nfs/file.c

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

e89e896d31b11a51a54ddcd3f72a76bd286dd86c
Reading git-diff-tree failed