git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: db28569 28bec7b)

author	John W. Linville <linville@tuxdriver.com>
	Fri, 18 Feb 2011 22:03:41 +0000 (17:03 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 18 Feb 2011 22:03:41 +0000 (17:03 -0500)
commit	b67afe7f43afd2f5cd98798993561920c1684c12
tree	e45a0e41c91a1d199fd865b011ed0d25f5497bb9	tree \| snapshot
parent	db28569adc692d9fb8a2d2d8e7ebab7fd5481f10	commit \| diff
parent	28bec7b845e10b68e6ba1ade5de0fc566690fc61	commit \| diff

Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/bluetooth/ath3k.c
drivers/bluetooth/btusb.c

18 files changed:

drivers/bluetooth/ath3k.c	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/btusb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-6000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl1251/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/status.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules