git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.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	08b16cca81bf520d0738ee8af90d184d7e95e569
tree	5425df5f33fadc617c7dec99578d06f0d933578e	tree \| snapshot
parent	63eea9a47f7536aa84ab2173d5867865e4049118	commit \| diff
parent	0cf16b9f63986baebfe3072f570ff7be1f49af31	commit \| diff

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

Linux Kernel Source Tree.

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