Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus
authorTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 7 Dec 2006 20:48:15 +0000 (15:48 -0500)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 7 Dec 2006 20:48:15 +0000 (15:48 -0500)
commit34161db6b14d984fb9b06c735b7b42f8803f6851
tree99656278b6697f1cde5b05894b7c0ee22c63a00e
parent5847e1f4d058677c5e46dc6c3e3c70e8855ea3ba
parent620034c84d1d939717bdfbe02c51a3fee43541c3
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.
net/sunrpc/sched.c
net/sunrpc/xprt.c
net/sunrpc/xprtsock.c