review.tizen.org Git - platform/kernel/linux-amlogic.git/commit

projects / platform / kernel / linux-amlogic.git / commit

author	John W. Linville <linville@tuxdriver.com>
	Mon, 25 Apr 2011 18:34:25 +0000 (14:34 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 25 Apr 2011 18:34:25 +0000 (14:34 -0400)
commit	cfef6047c4027a8448ec8dafeaf2bb362cc882e4
tree	c254bd25aa8b4b0696b5b5cc45d8e30c7c1bb9dd	tree \| snapshot
parent	b71d1d426d263b0b6cb5760322efebbfc89d4463	commit \| diff
parent	73b48099cc265f88fa1255f3f43e52fe6a94fd5c	commit \| diff

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

Conflicts:
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/rt2x00/rt2x00queue.c
drivers/net/wireless/rt2x00/rt2x00queue.h

35 files changed:

drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/desc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/pcu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hif_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_hst.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.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/rc.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/ath/regd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl4965-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-fh.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00config.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00crypto.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00link.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00queue.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00queue.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00usb.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
include/linux/nl80211.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_sock.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh_pathtbl.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.h	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;

RSS Atom

drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/desc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/pcu.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hif_usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_hst.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.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/rc.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/ath/regd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl4965-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-fh.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00config.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00crypto.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00link.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00queue.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00queue.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2x00usb.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
include/linux/nl80211.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_sock.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh_pathtbl.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.h	diff1 \|	diff2 \|	blob \| history