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: deb0928 69a2bac)

author	John W. Linville <linville@tuxdriver.com>
	Wed, 10 Apr 2013 13:31:39 +0000 (09:31 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 10 Apr 2013 13:31:39 +0000 (09:31 -0400)
commit	6fe5468f452c0c40348ebd4e737758a842286ca8
tree	befe5ab33c457a9e695b65be72600f383266e611	tree \| snapshot
parent	deb09280cd72ceb8b0679490f076d0e9f30dd456	commit \| diff
parent	69a2bac8984c4e6dba78b330ed183fd580c65e99	commit \| diff

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

Conflicts:
drivers/net/wireless/rt2x00/rt2x00pci.c

14 files changed:

drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800pci.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/iface.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/offchannel.c	diff1 \|	diff2 \|	blob \| history
net/nfc/llcp/llcp.c	diff1 \|	diff2 \|	blob \| history
net/nfc/llcp/sock.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules