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

[Jeff Garzik <jeff@garzik.org>]

John W. Linville wrote:
> The following changes since commit b1944354101f15f4afeffd842e12c7d70fb7e822:
>   John W. Linville (1):
>         Merge branch 'upstream-fixes' into upstream
> 
> are found in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git upstream
> 
> Daniel Drake (3):
>       zd1211rw: Mark some data const
>       zd1211rw: Don't handle broken frames in monitor mode
>       zd1211rw: Add another ID for Linksys WUSBF54G
> 
> Jouni Malinen (1):
>       Update my email address from jkmaline@cc.hut.fi to j@w1.fi
> 
>  MAINTAINERS                                   |    5 +++--
>  crypto/michael_mic.c                          |    4 ++--
>  drivers/net/wireless/hostap/hostap_ap.c       |    4 ++--
>  drivers/net/wireless/hostap/hostap_cs.c       |    2 +-
>  drivers/net/wireless/hostap/hostap_hw.c       |    4 ++--
>  drivers/net/wireless/hostap/hostap_main.c     |    4 ++--
>  drivers/net/wireless/hostap/hostap_pci.c      |    2 +-
>  drivers/net/wireless/hostap/hostap_plx.c      |    2 +-
>  drivers/net/wireless/ipw2100.c                |    4 ++--
>  drivers/net/wireless/zd1211rw/zd_mac.c        |   13 ++-----------
>  drivers/net/wireless/zd1211rw/zd_rf.c         |    2 +-
>  drivers/net/wireless/zd1211rw/zd_rf_al7230b.c |    4 ++--
>  drivers/net/wireless/zd1211rw/zd_rf_rf2959.c  |    4 ++--
>  drivers/net/wireless/zd1211rw/zd_usb.c        |    1 +
>  include/linux/wireless.h                      |    2 +-
>  include/net/ieee80211.h                       |    4 ++--
>  include/net/ieee80211_crypt.h                 |    4 ++--
>  net/ieee80211/ieee80211_crypt.c               |    2 +-
>  net/ieee80211/ieee80211_crypt_ccmp.c          |    2 +-
>  net/ieee80211/ieee80211_crypt_tkip.c          |    2 +-
>  net/ieee80211/ieee80211_crypt_wep.c           |    2 +-
>  net/ieee80211/ieee80211_module.c              |    4 ++--
>  net/ieee80211/ieee80211_rx.c                  |    4 ++--
>  net/ieee80211/ieee80211_wx.c                  |    4 ++--
>  24 files changed, 39 insertions(+), 46 deletions(-)

hrm, it doesn't seem to like my #upstream, can you wait a bit for 
kernel.org propagation, and then redo with these already merged?  Also, 
please pull branch libertas into your #upstream.

Auto-merged MAINTAINERS
Auto-merged drivers/net/wireless/libertas/debugfs.c
CONFLICT (add/add): Merge conflict in 
drivers/net/wireless/libertas/debugfs.c
Auto-merged include/net/ieee80211_radiotap.h
CONFLICT (content): Merge conflict in include/net/ieee80211_radiotap.h
Automatic merge failed; fix conflicts and then commit the result.