git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbd65a7 66f41d4)
Merge commit 'v2.6.34-rc6'
authorJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 4 May 2010 15:27:05 +0000 (11:27 -0400)
committerJ. Bruce Fields <bfields@citi.umich.edu>
Tue, 4 May 2010 15:29:05 +0000 (11:29 -0400)
Conflicts:
fs/nfsd/nfs4callback.c


Trivial merge
Pandora Kernel Repository