Merge branch 'devel' into linux-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 4 Dec 2009 02:27:36 +0000 (21:27 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Fri, 4 Dec 2009 02:27:36 +0000 (21:27 -0500)
commit7285f2d2ffd4b7ab4ffb70a47759ee209c30017b
tree255cdddc72429f013b3bcf5c51d1818cb3e3bd51
parent0b08b07507d5ae733408fd4ebda1cd89d3a840ef
parent44ed3556bad809797f7b06a4a88918fd8a23d6fe
Merge branch 'devel' into linux-next
fs/nfs/nfs4proc.c
fs/nfs/nfs4state.c