projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
805a3b8
51892db
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Tue, 7 Jun 2011 18:07:11 +0000
(14:07 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Tue, 7 Jun 2011 18:07:11 +0000
(14:07 -0400)
1
2
drivers/net/wireless/iwlegacy/iwl-4965.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-2000.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-5000.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-6000.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-agn.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-core.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-core.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/iwlegacy/iwl-4965.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/iwl-2000.c
index
a37c41b
,
2282279
..
5484ab7
---
1
/
drivers/net/wireless/iwlwifi/iwl-2000.c
---
2
/
drivers/net/wireless/iwlwifi/iwl-2000.c
+++ b/
drivers/net/wireless/iwlwifi/iwl-2000.c
@@@
-256,8
-183,8
+183,7
@@@
static struct iwl_lib_ops iwl2000_lib
.setup_deferred_work = iwlagn_bt_setup_deferred_work,
.cancel_deferred_work = iwlagn_bt_cancel_deferred_work,
.is_valid_rtc_data_addr = iwlagn_hw_valid_rtc_data_addr,
- .send_tx_power = iwlagn_send_tx_power,
.update_chain_flags = iwl_update_chain_flags,
- .set_channel_switch = iwl2030_hw_channel_switch,
.apm_ops = {
.init = iwl_apm_init,
.config = iwl2000_nic_config,
diff --cc
drivers/net/wireless/iwlwifi/iwl-5000.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/iwl-6000.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/iwl-agn.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/iwl-core.c
Simple merge
diff --cc
drivers/net/wireless/iwlwifi/iwl-core.h
Simple merge