git.maquefel.me Git - linux.git/commit

author	John W. Linville <linville@tuxdriver.com>
	Fri, 29 Mar 2013 20:41:36 +0000 (16:41 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 29 Mar 2013 20:41:36 +0000 (16:41 -0400)
commit	9a574cd67a447059f9c14bbef47873315d7f7b35
tree	0ebb71d213d868d8884b1fa0e05b7393c66c665b	tree \| snapshot
parent	689b66cb53fbb5d567aa4e095eaa828aff73aef0	commit \| diff
parent	2e1253d640eb7f8707d2591c93097c1e9f9c71d5	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless

Conflicts:
net/mac80211/sta_info.c
net/wireless/core.h

24 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_calib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/3945-mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/ucode.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cmdevt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/usb.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.h	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/trace.h	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_calib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_lcn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/3945-mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/ucode.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cmdevt.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/main.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/usb.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/core.h	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/trace.h	diff1 \|	diff2 \|	blob \| history