projects
/
platform
/
kernel
/
linux-exynos.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b693289
ba5736a
)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
author
Luciano Coelho
<coelho@ti.com>
Thu, 1 Dec 2011 10:14:48 +0000
(12:14 +0200)
committer
Luciano Coelho
<coelho@ti.com>
Thu, 1 Dec 2011 10:14:48 +0000
(12:14 +0200)
1
2
drivers/net/wireless/wl12xx/boot.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/wl12xx/scan.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/net/wireless/wl12xx/spi.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/net/wireless/wl12xx/boot.c
index
4ce634b
,
6813379
..
6e140bf
---
1
/
drivers/net/wireless/wl12xx/boot.c
---
2
/
drivers/net/wireless/wl12xx/boot.c
+++ b/
drivers/net/wireless/wl12xx/boot.c
@@@
-23,8
-23,8
+23,9
@@@
#include <linux/slab.h>
#include <linux/wl12xx.h>
+ #include <linux/export.h>
+#include "debug.h"
#include "acx.h"
#include "reg.h"
#include "boot.h"
diff --cc
drivers/net/wireless/wl12xx/scan.c
Simple merge
diff --cc
drivers/net/wireless/wl12xx/spi.c
Simple merge