git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f289b0d bb6d5f4)

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	70c7d3318fdb3035d2b51808c2876b2cb1c72188
tree	befe5ab33c457a9e695b65be72600f383266e611	tree \| snapshot
parent	f289b0d56fbfbca1401a22c1e78f37724c922b6d	commit \| diff
parent	bb6d5f49de299d4027313bb22d02c2a2a583cc7f	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 Source Tree.