From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Tue, 13 Feb 2007 06:43:25 +0000 (-0800)
Subject: Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
X-Git-Tag: v2.6.21-rc1~274
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d9bc125caf592b7d081021f32ce5b717efdf70c8;p=linux-2.6-omap-h63xx.git

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

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.
---

d9bc125caf592b7d081021f32ce5b717efdf70c8