From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 18 Jun 2009 01:13:00 +0000 (-0700)
Subject: Merge branch 'devel-for-2.6.31' into for-2.6.31
X-Git-Tag: v2.6.31-rc1~58^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81;p=pandora-kernel.git

Merge branch 'devel-for-2.6.31' into for-2.6.31

Conflicts:
	fs/nfs/client.c
	fs/nfs/super.c
---

1f84603c0940d5bed17f7e4d2e0b2a4b8b8f1b81
Reading git-diff-tree failed