git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
xen
/
p2m.c
diff --git
a/arch/arm/xen/p2m.c
b/arch/arm/xen/p2m.c
index e71eefa2e427bf2703ba7f6c7fb7a6577d8ab390..0641ba54ab62ae9786cb12ab88b2666b5c783b7a 100644
(file)
--- a/
arch/arm/xen/p2m.c
+++ b/
arch/arm/xen/p2m.c
@@
-1,7
+1,7
@@
#include <linux/bootmem.h>
#include <linux/gfp.h>
#include <linux/export.h>
-#include <linux/
rw
lock.h>
+#include <linux/
spin
lock.h>
#include <linux/slab.h>
#include <linux/types.h>
#include <linux/dma-mapping.h>