Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireles...
authorDavid S. Miller <davem@davemloft.net>
Tue, 10 Jun 2008 08:54:31 +0000 (01:54 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 10 Jun 2008 08:54:31 +0000 (01:54 -0700)
commit788c0a53164c05c5ccdb1472474372b72ba74644
tree5f274102e3dc4bcca6cb3a695aa2c8228ad5fc4f
parente64bda89b8fe81cce9b4a20885d2c204c2d52532
parent78cf07472f0ede8394bacc4bc02354505080cfe1
Merge branch 'master' of /linux/kernel/git/linville/wireless-next-2.6

Conflicts:

drivers/net/ps3_gelic_wireless.c
drivers/net/wireless/libertas/main.c
drivers/net/Kconfig
drivers/net/wireless/libertas/main.c
drivers/net/wireless/rtl8187_dev.c
drivers/net/wireless/zd1211rw/zd_mac.c
drivers/net/wireless/zd1211rw/zd_usb.c
include/net/mac80211.h
net/mac80211/mlme.c
net/mac80211/util.c