Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

projects / firefly-linux-kernel-4.4.55.git / commit

author	John W. Linville <linville@tuxdriver.com>
	Thu, 5 May 2011 17:32:35 +0000 (13:32 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Thu, 5 May 2011 17:32:35 +0000 (13:32 -0400)
commit	a70171dce9cd44cb06c7d299eba9fa87a8933045
tree	5425df5f33fadc617c7dec99578d06f0d933578e	tree \| snapshot
parent	5a412ad7f4c95bb5b756aa12b52646e857e7c75d	commit \| diff
parent	eaef6a93bd52a2cc47b9fce201310010707afdb4	commit \| diff

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

Conflicts:
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/rtlwifi/pci.c
net/bluetooth/l2cap_sock.c

28 files changed:

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/carl9170.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cfg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_spi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/main.c	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/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/regd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/wifi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/conf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/io.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/hci.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_sock.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/rc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/carl9170.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cfg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/if_spi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/main.c	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/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/regd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/wifi.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/conf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/wl12xx/io.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/hci.h	diff1 \|	diff2 \|	blob \| history
include/net/mac80211.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_sock.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/sta_info.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history