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

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ea812ca 88c1f4f)

author	David S. Miller <davem@davemloft.net>
	Fri, 2 Jul 2010 00:34:14 +0000 (17:34 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 2 Jul 2010 00:34:14 +0000 (17:34 -0700)
commit	05318bc905467237d4aa68a701f6e92a2b332218
tree	3b7577383bca50aeb442568aa16cf8f2167b8694	tree \| snapshot
parent	ea812ca1b06113597adcd8e70c0f84a413d97544	commit \| diff
parent	88c1f4f6dffe66e2fed8e7e3276e091ee850bed0	commit \| diff

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

Conflicts:
drivers/net/wireless/libertas/host.h

13 files changed:

drivers/net/wireless/at76c50x-usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/at76c50x-usb.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-commands.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/host.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rndis_wlan.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree