git://ftp.safe.ca / safe / jmp / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b08b07 44ed355)
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)
1  2 
fs/nfs/nfs4proc.c patch | diff1 | diff2 | blob | history
fs/nfs/nfs4state.c patch | diff1 | diff2 | blob | history

diff --cc fs/nfs/nfs4proc.c
Simple merge
diff --cc fs/nfs/nfs4state.c
Simple merge
Full containers within linux kernel