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 e805b2c)

author	John W. Linville <linville@tuxdriver.com>
	Fri, 29 Jun 2012 16:07:37 +0000 (12:07 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 29 Jun 2012 16:07:37 +0000 (12:07 -0400)
commit	8816972495094f9b2bb3361830821d8721c47068
tree	f53513819d11445385346cf75be05054dae3438d	tree \| snapshot
parent	969cf8d678720fba24b039bb7005c6639ea4aa58	commit \| diff
parent	e805b2ccdb5ce9d7c33fe7a638440efdd79ef4af	commit \| diff

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

15 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/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

Linux Kernel Source Tree.