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: 969cf8d dddf86b)

author	John W. Linville <linville@tuxdriver.com>
	Mon, 9 Jul 2012 20:34:34 +0000 (16:34 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 9 Jul 2012 20:34:34 +0000 (16:34 -0400)
commit	6468a2a5ac553473426988f2879d12f3b98276b2
tree	0456542caa85aff0f4edf91707e36850f76d585f	tree \| snapshot
parent	969cf8d678720fba24b039bb7005c6639ea4aa58	commit \| diff
parent	dddf86bb8835b6cf6df3f9afbecbae268a2b831e	commit \| diff

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

Conflicts:
net/mac80211/mlme.c

18 files changed:

drivers/bluetooth/btmrvl_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/bluetooth/btusb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/4965-mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/dvm/debugfs.c	diff1 \|	\|	blob \| history
drivers/net/wireless/iwlwifi/dvm/mac80211.c	diff1 \|	\|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/ie.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/nfc/llcp/sock.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.