git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 23 Jul 2010 21:03:38 +0000 (14:03 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 23 Jul 2010 21:03:38 +0000 (14:03 -0700)
commit	2a88e7e559f2358f4e1422d0b0c0278a74136581
tree	b4e9e56dbde79fe7185cba511a1ffd85f5d2018e	tree \| snapshot (tar.gz zip)
parent	344e0f623cec5eba273db06fe57db080988d6b26	commit \| diff
parent	7a17a33c0da37f8d24222c967550d19dabf13617	commit \| diff

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

Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h

Motorola kernel-slsi

drivers/net/wireless/airo.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-commands.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/host.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/orinoco/orinoco_usb.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history