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: b94db26 cb46fe1)

author	John W. Linville <linville@tuxdriver.com>
	Tue, 26 Apr 2011 19:39:10 +0000 (15:39 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 26 Apr 2011 19:39:10 +0000 (15:39 -0400)
commit	937b2053c4456c36c12c342b560b91f1041c1962
tree	dc4fd40ae54d177ddb3cb3991e8c3ff019eef238	tree \| snapshot
parent	b94db261b5e528542ba9b2e9b515d3009a8b0530	commit \| diff
parent	cb46fe1e7c56b4b04bff065ecbc699ca8028c91d	commit \| diff

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

13 files changed:

drivers/net/wireless/ath/ath9k/hif_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/mac.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl4965-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-tx.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.