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: a019a9c 601a631)

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	ab818e7a4807d3be85d9af8835aa8592741fac12
tree	3b7577383bca50aeb442568aa16cf8f2167b8694	tree \| snapshot
parent	a019a9c25b1a7033bc7f7ac9546e9c201dcec512	commit \| diff
parent	601a63198acbae3f7f99496ad4ebb39cb89559bd	commit \| diff

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

Linux Kernel Source Tree.