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 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[pandora-kernel.git]
/
fs
/
jfs
/
jfs_txnmgr.c
diff --git
a/fs/jfs/jfs_txnmgr.c
b/fs/jfs/jfs_txnmgr.c
index
81f6f04
..
d558e51
100644
(file)
--- a/
fs/jfs/jfs_txnmgr.c
+++ b/
fs/jfs/jfs_txnmgr.c
@@
-46,7
+46,7
@@
#include <linux/vmalloc.h>
#include <linux/smp_lock.h>
#include <linux/completion.h>
-#include <linux/
suspend
.h>
+#include <linux/
freezer
.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/kthread.h>