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: e66a8dd b4838d1)

author	John W. Linville <linville@tuxdriver.com>
	Thu, 12 Apr 2012 17:49:28 +0000 (13:49 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Thu, 12 Apr 2012 17:49:28 +0000 (13:49 -0400)
commit	8065248069097dddf9945acfb2081025e9618c16
tree	eddf3fb0372ba0f65c01382d386942ea8d18932d	tree \| snapshot
parent	e66a8ddff72e85605f2212a0ebc666c7e9116641	commit \| diff
parent	b4838d12e1f3cb48c2489a0b08733b5dbf848297	commit \| diff

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

13 files changed:

drivers/net/wireless/ath/ath5k/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/debug.c	diff1 \|	diff2 \|	blob \| history
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/iwlegacy/4965-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-rs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-debugfs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_netdev.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/debugfs_sta.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules