git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[pandora-kernel.git]
/
fs
/
btrfs
/
delayed-inode.h
diff --git
a/fs/btrfs/delayed-inode.h
b/fs/btrfs/delayed-inode.h
index
8d27af4
..
7083d08
100644
(file)
--- a/
fs/btrfs/delayed-inode.h
+++ b/
fs/btrfs/delayed-inode.h
@@
-25,7
+25,7
@@
#include <linux/mutex.h>
#include <linux/list.h>
#include <linux/wait.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include "ctree.h"