[LinuxPPS] 9 May 22:54 - Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville ...

[linuxpps: Jeff Garzik <>]

Merge branch 'upstream' of git://git./linux/kernel/git/linville/wireless-2.6 into upstream  
  
drivers/net/wireless/bcm43xx/bcm43xx.h  
drivers/net/wireless/bcm43xx/bcm43xx_dma.c  
drivers/net/wireless/bcm43xx/bcm43xx_main.c  
drivers/net/wireless/bcm43xx/bcm43xx_main.h  
drivers/net/wireless/zd1211rw/zd_usb.c  
include/net/ieee80211.h  
net/ieee80211/ieee80211_geo.c  
net/ieee80211/ieee80211_wx.c

URL: http://gitweb.enneenne.com/?p=linuxpps;a=commit;h=2c4f365ad2361c93c097e958b2b0a7a112750228