git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit - include/acpi/acpixf.h

author	Thierry Reding <treding@nvidia.com>
	Thu, 24 Oct 2013 12:35:39 +0000 (14:35 +0200)
committer	Thierry Reding <treding@nvidia.com>
	Thu, 24 Oct 2013 12:35:39 +0000 (14:35 +0200)
commit	f5f783e7a1bbb8a6540c35efc3cede9c6bc73a4d
tree	5aaa69a4e6f1ec479372e58e4a904964103a3a9d	tree \| snapshot
parent	d12775f173bb9ca71bd2ded4b4c4d78a3735020a	commit \| diff
parent	a1b13b9ad3759dca24c6b721ee026c540a4e6564	commit \| diff

Merge remote-tracking branch 'wireless-next/master'

Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
drivers/net/wireless/iwlwifi/pcie/drv.c

18 files changed:

drivers/net/wireless/ath/ath10k/debug.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.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/atmel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-config.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/power.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/rs.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/tx.c	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/bluetooth.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/hci_core.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/rfcomm.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

drivers/net/wireless/ath/ath10k/debug.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/wmi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.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/atmel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-config.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/power.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/rs.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/mvm/scan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/tx.c	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/bluetooth.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/hci_core.h	diff1 \|	diff2 \|	blob \| history
include/net/bluetooth/rfcomm.h	diff1 \|	diff2 \|	blob \| history