git.rot13.org Git - powerpc.git/commit

Merge branch 'master' into upstream

DSM-G600 Linux 2.6

drivers/net/ehea/ehea_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/gianfar_sysfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/phy_device.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/bcm43xx/bcm43xx_wx.c	diff1 \|	diff2 \|	blob \| history