Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Fri, 23 Jul 2010 21:03:38 +0000 (14:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 23 Jul 2010 21:03:38 +0000 (14:03 -0700)
commit2a88e7e559f2358f4e1422d0b0c0278a74136581
treeb4e9e56dbde79fe7185cba511a1ffd85f5d2018e
parent344e0f623cec5eba273db06fe57db080988d6b26
parent7a17a33c0da37f8d24222c967550d19dabf13617
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/airo.c
drivers/net/wireless/ipw2x00/ipw2100.c
drivers/net/wireless/iwlwifi/iwl-commands.h
drivers/net/wireless/libertas/host.h
drivers/net/wireless/mwl8k.c
drivers/net/wireless/orinoco/orinoco_usb.c
include/net/cfg80211.h
include/net/mac80211.h
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h