diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-04-30 19:11:13 +0200 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-04-30 19:12:47 +0200 |
| commit | 868c522b1b75fd3fd3e6a636b4c344ac08edf13a (patch) | |
| tree | d85b984d9818abc3ccc0237eb53b710d9e96c39e /fs/ubifs/commit.c | |
| parent | bd6d29c25bb1a24a4c160ec5de43e0004e01f72b (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6' into core/locking
Merge reason: Further lockdep patches depend on per cpu updates
made in -rc1.
Diffstat (limited to 'fs/ubifs/commit.c')
| -rw-r--r-- | fs/ubifs/commit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ubifs/commit.c b/fs/ubifs/commit.c index 4775af40116..37fa7ed062d 100644 --- a/fs/ubifs/commit.c +++ b/fs/ubifs/commit.c @@ -45,6 +45,7 @@ #include <linux/freezer.h> #include <linux/kthread.h> +#include <linux/slab.h> #include "ubifs.h" /** |