projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ecae42d
95acac6
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Fri, 15 Jul 2011 14:05:24 +0000
(10:05 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Fri, 15 Jul 2011 14:05:24 +0000
(10:05 -0400)
Conflicts:
net/bluetooth/l2cap_core.c
1
2
drivers/net/wireless/ath/ath5k/base.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/b43/main.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/iwlwifi/iwl-dev.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas/cmd.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas/cmdresp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas/main.c
patch
|
diff1
|
diff2
|
blob
|
history
include/net/bluetooth/hci_core.h
patch
|
diff1
|
diff2
|
blob
|
history
net/bluetooth/hci_core.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/ath/ath5k/base.c
Simple merge
diff --cc
drivers/net/wireless/b43/main.c
index
e9a01e3
,
8bcda50
..
092dd93
---
1
/
drivers/net/wireless/b43/main.c
---
2
/
drivers/net/wireless/b43/main.c
+++ b/
drivers/net/wireless/b43/main.c
@@@
-4104,9
-4243,15
+4243,15
@@@
static int b43_phy_versioning(struct b4
unsupported = 1;
break;
#endif
+ #ifdef CONFIG_B43_PHY_LCN
+ case B43_PHYTYPE_LCN:
+ if (phy_rev > 1)
+ unsupported = 1;
+ break;
+ #endif
default:
unsupported = 1;
- }
;
+ }
if (unsupported) {
b43err(dev->wl, "FOUND UNSUPPORTED PHY "
"(Analog %u, Type %u, Revision %u)\n",
diff --cc
drivers/net/wireless/iwlwifi/iwl-dev.h
Simple merge
diff --cc
drivers/net/wireless/libertas/cmd.c
Simple merge
diff --cc
drivers/net/wireless/libertas/cmdresp.c
Simple merge
diff --cc
drivers/net/wireless/libertas/main.c
Simple merge
diff --cc
include/net/bluetooth/hci_core.h
Simple merge
diff --cc
net/bluetooth/hci_core.c
Simple merge