James Morris 2b82892565 Merge branch 'master' into next ... Conflicts: security/keys/internal.h security/keys/process_keys.c security/keys/request_key.c Fixed conflicts above by using the non 'tsk' versions. Signed-off-by: James Morris <jmorris@namei.org>		2008-11-14 11:29:12 +11:00
..
client.c	Merge branch 'master' into next	2008-11-14 11:29:12 +11:00
error.c	9p: make cryptic unknown error from server less scary	2008-05-14 19:23:26 -05:00
Kconfig	9p: rdma: RDMA Transport Support for 9P	2008-10-22 18:47:39 -05:00
Makefile	9p: rdma: RDMA Transport Support for 9P	2008-10-22 18:47:39 -05:00
mod.c	9p: consolidate transport structure	2008-10-17 11:04:41 -05:00
protocol.c	9p: fix sparse warnings	2008-10-22 18:54:47 -05:00
protocol.h	9p: rework client code to use new protocol support functions	2008-10-17 11:04:45 -05:00
trans_fd.c	9p: fix debug build error	2008-10-22 18:47:40 -05:00
trans_rdma.c	9p: rdma: remove duplicated #include	2008-11-05 13:19:07 -06:00
trans_virtio.c	9p: make rpc code common and rework flush code	2008-10-17 11:04:42 -05:00
util.c	9p: rework client code to use new protocol support functions	2008-10-17 11:04:45 -05:00