git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bd1d421 eb04e0a)
Merge branch 'bugfixes' into linux-next
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 23 Apr 2013 19:52:14 +0000 (15:52 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 23 Apr 2013 19:52:14 +0000 (15:52 -0400)
Fix up a conflict between the linux-next branch and mainline.
Conflicts:
fs/nfs/nfs4proc.c


Trivial merge
Pandora Kernel Repository