Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
David S. Miller [Sun, 15 Feb 2009 07:12:00 +0000 (23:12 -0800)]
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c

1  2 
drivers/net/3c505.c
drivers/net/bnx2.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/phy/mdio-gpio.c
drivers/net/qlge/qlge_main.c
drivers/net/tg3.c
fs/compat_ioctl.c
include/net/sock.h
net/core/sock.c
net/mac80211/tx.c

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