Merge branch 'devel-for-2.6.31' into for-2.6.31
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 18 Jun 2009 01:13:00 +0000 (18:13 -0700)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 19 Jun 2009 01:13:44 +0000 (18:13 -0700)
Conflicts:
fs/nfs/client.c
fs/nfs/super.c


Trivial merge