]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5cb0c2d71b959c618130ff244b2ec8f96321d3a5
tree99656278b6697f1cde5b05894b7c0ee22c63a00e
parentdb72ee51b3a1c9bf9ed47c2a142aa3fbe220476c
parent11c01b9c4a832935872d3fe45b783c440e7580d4
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