Re: Please pull 'upstream' branch of wireless-2.6

[Jeff Garzik <jeff@garzik.org>]

John W. Linville wrote:
> The following changes since commit 5b94f675f57e4ff16c8fda09088d7480a84dcd91:
>   Linus Torvalds (1):
>         Merge master.kernel.org:/.../davem/sparc-2.6
> 
> are found in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream
> 
> Daniel Drake (1):
>       zd1211rw: Add ID for ZyXEL AG-225H v2
> 
> Larry Finger (3):
>       ieee80211: add ieee80211_channel_to_freq
>       ieee80211: include frequency in scan results
>       bcm43xx: Remove dead configuration variable CONFIG_947XX
> 
> Matthew Davidson (1):
>       zd1211rw: Add ID for Sitecom WL-117
> 
> Ulrich Kunitz (1):
>       zd1211rw: Added new USB id for Planex GW-US54ZGL
> 
>  drivers/net/wireless/bcm43xx/bcm43xx.h      |   18 +-----
>  drivers/net/wireless/bcm43xx/bcm43xx_dma.c  |    4 -
>  drivers/net/wireless/bcm43xx/bcm43xx_main.c |   81 ---------------------------
>  drivers/net/wireless/bcm43xx/bcm43xx_main.h |   19 ------
>  drivers/net/wireless/zd1211rw/zd_usb.c      |    4 +
>  include/net/ieee80211.h                     |    2 +
>  net/ieee80211/ieee80211_geo.c               |   16 +++++
>  net/ieee80211/ieee80211_wx.c                |    8 ++-
>  8 files changed, 31 insertions(+), 121 deletions(-)

pulled