git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43d78ef ec2f9d1)
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 13 Feb 2007 06:43:25 +0000 (22:43 -0800)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Tue, 13 Feb 2007 06:43:25 +0000 (22:43 -0800)
Conflicts:

net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c

Merge with mainline and fix conflicts.


Trivial merge
Pandora Kernel Repository