git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e1781ed 55afc80)

author	John W. Linville <linville@tuxdriver.com>
	Wed, 30 Dec 2009 20:25:08 +0000 (15:25 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 30 Dec 2009 20:25:08 +0000 (15:25 -0500)
commit	891dc5e73783eeabd2a704a9425e2a199b39c9f9
tree	9b4478941c486d47a71bfce455b896c5dda7e811	tree \| snapshot (tar.gz zip)
parent	e1781ed33a8809c58ad6c3b6d432d656446efa43	commit \| diff
parent	55afc80b2ab100618c17af77915f75307b6bd5d1	commit \| diff

Merge git://git./linux/kernel/git/linville/wireless-2.6

Conflicts:
drivers/net/wireless/libertas/scan.c

16 files changed:

drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-3945.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas_tf/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/wl1271_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/zd1211rw/zd_mac.c	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/mlme.c	diff1 \|	diff2 \|	blob \| history