Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

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

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

diff --cc drivers/net/netxen/netxen_nic_main.c
Simple merge

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

diff --cc drivers/s390/net/lcs.c
Simple merge