git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c056b73 b0302ab)

author	John W. Linville <linville@tuxdriver.com>
	Mon, 6 Feb 2012 19:26:39 +0000 (14:26 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 6 Feb 2012 19:26:39 +0000 (14:26 -0500)
commit	8926574c4d0055ca4c4a02d1f6b2c249d01a0621
tree	0c02c3cfff77e868d605246204add4664503b2af	tree \| snapshot
parent	c056b734e54e12f38f34a2583a4824e6cecc16c1	commit \| diff
parent	b0302aba812bcc39291cdab9ad7e37008f352a91	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
drivers/net/wireless/rtlwifi/rtl8192se/sw.c

15 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-commands.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192se/sw.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh_hwmp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh_plink.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.