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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/bonding/bond_main.c
Simple merge

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

diff --cc drivers/net/qlge/qlge.h
Simple merge

diff --cc drivers/net/qlge/qlge_main.c
Simple merge

diff --cc drivers/net/qlge/qlge_mpi.c
Simple merge

diff --cc drivers/net/sfc/rx.c
Simple merge

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

diff --cc drivers/net/wireless/airo.c
Simple merge

diff --cc drivers/net/wireless/b43/main.c
Simple merge

diff --cc drivers/net/wireless/libertas/if_spi.c
Simple merge

diff --cc net/ipv4/raw.c
Simple merge

diff --cc net/mac80211/mlme.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

diff --cc net/wireless/mlme.c
Simple merge

diff --cc net/wireless/sme.c
Simple merge