Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

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

diff --cc drivers/net/qlcnic/qlcnic_hw.c
Simple merge

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

diff --cc drivers/net/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-agn-rs.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge

diff --cc drivers/net/wireless/iwlwifi/iwl-tx.c
Simple merge

diff --cc drivers/vhost/vhost.c
Simple merge

diff --cc include/net/x25.h
Simple merge

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

diff --cc net/ipv6/udp.c
Simple merge

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

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

diff --cc net/x25/af_x25.c
Simple merge

diff --cc net/x25/x25_in.c
Simple merge