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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 69f4aab 0a54917)

author	John W. Linville <linville@tuxdriver.com>
	Wed, 8 Dec 2010 21:23:31 +0000 (16:23 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 8 Dec 2010 21:23:31 +0000 (16:23 -0500)
commit	393934c6b5c8d00f9d1ae20670d4a770f07a418a
tree	dad33cd2e4fc0e3d3b28dcbc36cfb44178cb046c	tree \| snapshot
parent	69f4aab1157d2a386e7ea4de77cc253629d1b4f2	commit \| diff
parent	0a54917c3fc295cb61f3fb52373c173fd3b69f48	commit \| diff

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

Conflicts:
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/ath/ath9k/xmit.c

13 files changed:

drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_def.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hif_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/mac.c	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/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco/wext.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree