Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
David S. Miller [Sun, 11 Apr 2010 09:44:30 +0000 (02:44 -0700)]
15 files changed:
1  2 
drivers/net/myri10ge/myri10ge.c
drivers/net/qlcnic/qlcnic_hw.c
drivers/net/r6040.c
drivers/net/stmmac/stmmac_main.c
drivers/net/wireless/iwlwifi/iwl-agn-rs.c
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/vhost/vhost.c
include/net/x25.h
net/ipv4/udp.c
net/ipv6/udp.c
net/mac80211/mesh.c
net/mac80211/rx.c
net/x25/af_x25.c
net/x25/x25_in.c

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