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

…

conv.c

…

error.c

net: replace remaining __FUNCTION__ occurrences

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

fcprint.c

…

Kconfig

…

Makefile

…

mod.c

…

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

…