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

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

author	John W. Linville <linville@tuxdriver.com>
	Tue, 3 Jan 2012 20:16:34 +0000 (15:16 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 3 Jan 2012 20:16:34 +0000 (15:16 -0500)
commit	108ddc3cb4b88ba9e47fbcc552d36261e711824a
tree	a22d95cd3a96cbd515cd24fb0833739576c5e92f	tree \| snapshot
parent	0ff196dc7d7d552e8ede2fbd834353f2094731f7	commit \| diff
parent	c6e5941d43aa6ac3956ffaa84aef26084a34bc93	commit \| diff

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

Conflicts:
drivers/net/wireless/b43/dma.c
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

18 files changed:

drivers/net/wireless/ath/ath6kl/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_def.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/phy_n.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/wifi.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/l2cap.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_sock.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

drivers/net/wireless/ath/ath6kl/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_def.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/b43/phy_n.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rt2x00/rt2800usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/wifi.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/l2cap.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_event.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_sock.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/core.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/sco.c	diff1 \|	diff2 \|	blob \| history