git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 9835a30 069f40f)

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	429576b97c623b9c4e3375fb7c37bce377f51e68
tree	dc4fd40ae54d177ddb3cb3991e8c3ff019eef238	tree \| snapshot
parent	9835a30e980561082beb02ce724f6e555787bc19	commit \| diff
parent	069f40fc07f6df3da325e7ea1698a0d6247983d5	commit \| diff

Merge branch 'master' of git://git./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

John Crispins staging tree