diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:35:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-15 03:36:16 -0400 |
| commit | b257c14ceb1194a6181144210056d38f22127189 (patch) | |
| tree | c803925f1d5bf2237e7495d306bf43929df0c952 /fs/nfs/super.c | |
| parent | 371fd7e7a56a5c136d31aa980011bd2f131c3ef5 (diff) | |
| parent | 2ba3abd8186f24c7fb418927025b4e2120e3a362 (diff) | |
Merge branch 'linus' into sched/core
Merge reason: merge the latest fixes, update to -rc4.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'fs/nfs/super.c')
| -rw-r--r-- | fs/nfs/super.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 6baf9a393466..e01637240eeb 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <linux/vfs.h> | 48 | #include <linux/vfs.h> |
| 49 | #include <linux/inet.h> | 49 | #include <linux/inet.h> |
| 50 | #include <linux/in6.h> | 50 | #include <linux/in6.h> |
| 51 | #include <linux/slab.h> | ||
| 51 | #include <net/ipv6.h> | 52 | #include <net/ipv6.h> |
| 52 | #include <linux/netdevice.h> | 53 | #include <linux/netdevice.h> |
| 53 | #include <linux/nfs_xdr.h> | 54 | #include <linux/nfs_xdr.h> |