From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 Jul 2011 17:59:46 +0000 (-0400)
Subject: Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
X-Git-Tag: v3.1-rc1~136^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f00bcb38ef9a980a33c6dbdc0044964b05f22dd;p=pandora-kernel.git

Merge branch 'master' into devel and apply fixup from Stephen Rothwell:

vfs/nfs: fixup for nfs_open_context change

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

5f00bcb38ef9a980a33c6dbdc0044964b05f22dd
Reading git-diff-tree failed