linux/net/9p
David S. Miller 21a180cda0 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
	net/ipv4/Kconfig
	net/ipv4/tcp_timer.c
2010-10-04 11:56:38 -07:00
..
client.c net: return operator cleanup 2010-09-23 14:33:39 -07:00
error.c net/9p: insulate the client against an invalid error code sent by a 9p server 2009-08-17 16:39:54 -05:00
Kconfig 9p: disallow RDMA if RDMA CM isn't available 2009-01-15 16:39:42 -08: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: Implement client side of setattr for 9P2000.L protocol. 2010-08-02 14:25:10 -05:00
protocol.h 9P2010.L handshake: Remove "dotu" variable 2010-03-05 15:04:42 -06:00
trans_fd.c net/9p/trans_fd.c: Fix unsigned return type 2010-09-06 18:48:42 -07:00
trans_rdma.c net: Remove unnecessary returns from void function()s 2010-05-17 23:23:14 -07:00
trans_virtio.c net/9p: Mount only matching virtio channels 2010-09-27 15:54:44 -07:00
util.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00