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

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 11b7c60 35dd050)

author	John W. Linville <linville@tuxdriver.com>
	Mon, 7 Jun 2010 19:13:46 +0000 (15:13 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 7 Jun 2010 19:13:46 +0000 (15:13 -0400)
commit	9d88477c41904127ab9ae1f3b5b4a39bf6474043
tree	f50d5185ac89a9fd76d7cb087b952d5c55d5063b	tree \| snapshot
parent	11b7c60988e5fbabb4e150612931cc068559af16	commit \| diff
parent	35dd0509b21e4b5bab36b9eb80c8dab0322f5007	commit \| diff

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

Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.h

13 files changed:

drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54usb.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/driver-ops.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history

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