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

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

author	John W. Linville <linville@tuxdriver.com>
	Tue, 22 Nov 2011 19:05:46 +0000 (14:05 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Tue, 22 Nov 2011 19:05:46 +0000 (14:05 -0500)
commit	ef68552dea82f5fdd58a19ead0604e7e10ded2cf
tree	74f915531710303397d34069b325c2be7a5ac93c	tree \| snapshot
parent	ef11774055c43e773c8eff85a4a4af8b05215d59	commit \| diff
parent	41b1a2b1efa8a1529300e2e682a04c37411900c5	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

Conflicts:
drivers/net/wireless/iwlegacy/iwl-debugfs.c
drivers/net/wireless/iwlegacy/iwl-rx.c
drivers/net/wireless/iwlegacy/iwl-scan.c
drivers/net/wireless/iwlegacy/iwl-tx.c
include/net/bluetooth/bluetooth.h

47 files changed:

drivers/net/wireless/ath/ath.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/debug.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/btcoex.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/regd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/hostap/hostap_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/debug.c	diff1 \|	\|	blob \| history
drivers/net/wireless/iwlegacy/iwl-sta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/usb.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	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/sock.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_sysfs.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_sock.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ht.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/offchannel.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/status.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/nfc/nci/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/wext-compat.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.

RSS Atom

drivers/net/wireless/ath/ath.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/debug.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath6kl/sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/btcoex.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/debug.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/regd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/hostap/hostap_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlegacy/debug.c	diff1 \|	\|	blob \| history
drivers/net/wireless/iwlegacy/iwl-sta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/pci.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192cu/sw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/usb.c	diff1 \|	diff2 \|	blob \| history
include/linux/skbuff.h	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/sock.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/hci_sysfs.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/l2cap_sock.c	diff1 \|	diff2 \|	blob \| history
net/bluetooth/mgmt.c	diff1 \|	diff2 \|	blob \| history
net/core/skbuff.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ht.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/offchannel.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/status.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/nfc/nci/core.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/wext-compat.c	diff1 \|	diff2 \|	blob \| history