Merge branch 'master' into upstream

diff --cc drivers/net/ehea/ehea_main.c
Simple merge

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

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

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/wireless/bcm43xx/bcm43xx_wx.c
Simple merge