projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4562487
268bae0
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
John W. Linville
<linville@tuxdriver.com>
Wed, 25 Aug 2010 18:51:42 +0000
(14:51 -0400)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 25 Aug 2010 18:51:42 +0000
(14:51 -0400)
Conflicts:
drivers/net/wireless/libertas/if_sdio.c
14 files changed:
1
2
Documentation/DocBook/Makefile
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/b43/phy_n.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/ipw2x00/ipw2100.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas/cfg.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas/if_cs.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas/if_sdio.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas/if_usb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/libertas_tf/if_usb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rt2x00/rt2500usb.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rt2x00/rt2800lib.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rt2x00/rt2x00queue.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rt2x00/rt61pci.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/rt2x00/rt73usb.c
patch
|
diff1
|
diff2
|
blob
|
history
include/linux/netdevice.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/DocBook/Makefile
Simple merge
diff --cc
drivers/net/wireless/b43/phy_n.c
Simple merge
diff --cc
drivers/net/wireless/ipw2x00/ipw2100.c
Simple merge
diff --cc
drivers/net/wireless/libertas/cfg.c
index
3e82f16
,
03b7108
..
317f086
---
1
/
drivers/net/wireless/libertas/cfg.c
---
2
/
drivers/net/wireless/libertas/cfg.c
+++ b/
drivers/net/wireless/libertas/cfg.c
@@@
-6,10
-6,9
+6,11
@@@
*
*/
+#include <linux/sched.h>
+#include <linux/wait.h>
#include <linux/slab.h>
#include <linux/sched.h>
+ #include <linux/wait.h>
#include <linux/ieee80211.h>
#include <net/cfg80211.h>
#include <asm/unaligned.h>
diff --cc
drivers/net/wireless/libertas/if_cs.c
Simple merge
diff --cc
drivers/net/wireless/libertas/if_sdio.c
Simple merge
diff --cc
drivers/net/wireless/libertas/if_usb.c
Simple merge
diff --cc
drivers/net/wireless/libertas_tf/if_usb.c
Simple merge
diff --cc
drivers/net/wireless/rt2x00/rt2500usb.c
Simple merge
diff --cc
drivers/net/wireless/rt2x00/rt2800lib.c
Simple merge
diff --cc
drivers/net/wireless/rt2x00/rt2x00queue.c
Simple merge
diff --cc
drivers/net/wireless/rt2x00/rt61pci.c
Simple merge
diff --cc
drivers/net/wireless/rt2x00/rt73usb.c
Simple merge
diff --cc
include/linux/netdevice.h
Simple merge