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

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1e60896 77d2ece)

author	John W. Linville <linville@tuxdriver.com>
	Wed, 21 Nov 2012 19:43:51 +0000 (14:43 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 21 Nov 2012 19:43:51 +0000 (14:43 -0500)
commit	75c8ec71fb29ed59c4b9bda2f411ed3b09164cf7
tree	c1dfd91e624b48ccefa71db573d043b639fe088f	tree \| snapshot
parent	1e60896fe07307baa5f3ca1a220dfa9792657352	commit \| diff
parent	77d2ece6fde80631193054edc9c9a3edad519565	commit \| diff

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

12 files changed:

drivers/net/wireless/ath/ath9k/htc_drv_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192ce/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192de/trx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192se/trx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history

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