projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e2ff049
400e020
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
author
John W. Linville
<linville@tuxdriver.com>
Wed, 21 Nov 2012 17:57:56 +0000
(12:57 -0500)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 21 Nov 2012 17:57:56 +0000
(12:57 -0500)
Conflicts:
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
drivers/net/wireless/iwlwifi/pcie/tx.c
21 files changed:
1
2
drivers/net/wireless/ath/ath9k/hw.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/dvm/mac80211.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/dvm/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/pcie/rx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/mwifiex/cmdevt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/mwifiex/sdio.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rt2x00/rt2800lib.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/nfc/pn533.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bluetooth/hci_core.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bluetooth/mgmt.c
patch
|
diff1
|
diff2
|
blob
|
history
net/bluetooth/smp.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/cfg.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/ibss.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/ieee80211_i.h
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/main.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/scan.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/sta_info.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/status.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/tx.c
patch
|
diff1
|
diff2
|
blob
|
history
net/mac80211/util.c
patch
|
diff1
|
diff2
|
blob
|
history
net/nfc/llcp/llcp.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/ath/ath9k/hw.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/dvm/mac80211.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/dvm/main.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/pcie/rx.c
Simple merge
diff --cc
drivers/net/wireless/mwifiex/cmdevt.c
Simple merge
diff --cc
drivers/net/wireless/mwifiex/sdio.c
Simple merge
diff --cc
drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge
diff --cc
drivers/nfc/pn533.c
Simple merge
diff --cc
net/bluetooth/hci_core.c
Simple merge
diff --cc
net/bluetooth/mgmt.c
Simple merge
diff --cc
net/bluetooth/smp.c
Simple merge
diff --cc
net/mac80211/cfg.c
Simple merge
diff --cc
net/mac80211/ibss.c
Simple merge
diff --cc
net/mac80211/ieee80211_i.h
Simple merge
diff --cc
net/mac80211/main.c
Simple merge
diff --cc
net/mac80211/scan.c
Simple merge
diff --cc
net/mac80211/sta_info.c
Simple merge
diff --cc
net/mac80211/status.c
Simple merge
diff --cc
net/mac80211/tx.c
Simple merge
diff --cc
net/mac80211/util.c
Simple merge
diff --cc
net/nfc/llcp/llcp.c
Simple merge