Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorDavid S. Miller <davem@davemloft.net>
Sat, 25 Apr 2009 23:36:46 +0000 (16:36 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 25 Apr 2009 23:36:46 +0000 (16:36 -0700)
commit495a1b4eff1a216a3ea171ac137f1807e6555f52
tree72d059d6d66fac6a74df33bac2eb40dcd0ea0732
parentad8affd972a705a38e769859c50ee8e749b631da
parentd3feaf5ad12259927039a675cfb25dc342b403ab
Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next-2.6

Conflicts:
net/mac80211/pm.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
net/mac80211/rx.c