Merge redhat.com:/spare/repo/netdev-2.6/netdev-alloc-5

into redhat.com:/spare/repo/net-drivers-2.5

diff --cc drivers/net/Space.c
Simple merge

diff --cc drivers/net/hamradio/baycom_epp.c
Simple merge

diff --cc drivers/net/sk98lin/skge.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc net/atm/clip.c
Simple merge

diff --cc net/core/dev.c
Simple merge