David S. Miller 06802a819a Merge branch 'master' of ../net-2.6/ ...

Conflicts:

	net/ipv6/ndisc.c

2008-03-23 22:54:03 -07:00

..

client.c

9p: transport API reorganization

2008-02-06 19:25:03 -06:00

conv.c

[NET] 9p: kill dead static inline buf_put_string

2008-01-31 19:27:05 -08:00

error.c

net: replace remaining __FUNCTION__ occurrences

2008-03-05 20:47:47 -08:00

fcprint.c

9p: fix p9_printfcall export

2008-02-06 19:25:01 -06:00

Kconfig

9p: add virtio transport

2007-10-23 13:47:31 -05:00

Makefile

9p: transport API reorganization

2008-02-06 19:25:03 -06:00

mod.c

9p: transport API reorganization

2008-02-06 19:25:03 -06:00

trans_fd.c

[9P] net/9p/trans_fd.c: remove unused variable

2008-03-22 18:05:33 -07:00

trans_virtio.c

net/9p/trans_virtio.c: kmalloc() enough memory

2008-02-19 16:25:30 -08:00

util.c

9p: Convert semaphore to spinlock for p9_idpool

2008-02-06 19:25:04 -06:00