From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 7 Dec 2006 20:48:15 +0000 (-0500)
Subject: Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
X-Git-Tag: v2.6.20-rc1~34^2~412^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34161db6b14d984fb9b06c735b7b42f8803f6851;p=pandora-kernel.git

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

Conflicts:

	include/linux/sunrpc/xprt.h
	net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.
---

34161db6b14d984fb9b06c735b7b42f8803f6851
Reading git-diff-tree failed