Skip to content
Commit 34161db6 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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.
parents 5847e1f4 620034c8
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment