Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
authorDavid S. Miller <davem@davemloft.net>
Sun, 15 Feb 2009 07:12:00 +0000 (23:12 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 15 Feb 2009 07:12:00 +0000 (23:12 -0800)
commit5e30589521518bff36fd2638b3c3d69679c50436
tree6ac985658a06b0787e4354d0d16d380ea9b16a5a
parentac178ef0ae9eb44fd527d87aa9b6394e05f56e1f
parentd2f8d7ee1a9b4650b4e43325b321801264f7c37a
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
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