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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

diff --cc drivers/net/3c505.c
Simple merge

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

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

diff --cc drivers/net/phy/mdio-gpio.c
Simple merge

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

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

diff --cc fs/compat_ioctl.c
Simple merge

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

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

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