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

author	John W. Linville <linville@tuxdriver.com>
	Wed, 14 Dec 2011 19:35:41 +0000 (14:35 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 14 Dec 2011 19:35:41 +0000 (14:35 -0500)
commit	5d22df200beccb1dea26fe4d8684ed93ae2f0aeb
tree	05220b08a0c9d170ad88e3b9ed0390750d22d8ea	tree \| snapshot
parent	8b1fdb53075bd794a209a611bc94aedaf7ecf9e2	commit \| diff
parent	78feb35b8161acd95c33a703ed6ab6f554d29387	commit \| diff

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

Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c

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

drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-mac80211.c	diff1 \|	\|	blob \| history
drivers/ssb/driver_pcicore.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/nfc/nci/core.c	diff1 \|	diff2 \|	blob \| history