diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 09:45:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-02 09:45:39 -0700 |
| commit | de0a5345a55b8dd5a4695181275df0e691176830 (patch) | |
| tree | 17530e824f7f46ce0b1757657179fb5957a6add5 /fs | |
| parent | 994c0e992522c123298b4a91b72f5e67ba2d1123 (diff) | |
| parent | 8535639810e578960233ad39def3ac2157b0c3ec (diff) | |
| download | op-kernel-dev-de0a5345a55b8dd5a4695181275df0e691176830.zip op-kernel-dev-de0a5345a55b8dd5a4695181275df0e691176830.tar.gz | |
Merge branch 'for-linus' of git://github.com/richardweinberger/linux
* 'for-linus' of git://github.com/richardweinberger/linux: (90 commits)
um: fix ubd cow size
um: Fix kmalloc argument order in um/vdso/vma.c
um: switch to use of drivers/Kconfig
UserModeLinux-HOWTO.txt: fix a typo
UserModeLinux-HOWTO.txt: remove ^H characters
um: we need sys/user.h only on i386
um: merge delay_{32,64}.c
um: distribute exports to where exported stuff is defined
um: kill system-um.h
um: generic ftrace.h will do...
um: segment.h is x86-only and needed only there
um: asm/pda.h is not needed anymore
um: hw_irq.h can go generic as well
um: switch to generic-y
um: clean Kconfig up a bit
um: a couple of missing dependencies...
um: kill useless argument of free_chan() and free_one_chan()
um: unify ptrace_user.h
um: unify KSTK_...
um: fix gcov build breakage
...
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/hostfs/hostfs_user.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/hostfs/hostfs_user.c b/fs/hostfs/hostfs_user.c index d51a9838..dd7bc38 100644 --- a/fs/hostfs/hostfs_user.c +++ b/fs/hostfs/hostfs_user.c @@ -16,7 +16,6 @@ #include <sys/vfs.h> #include "hostfs.h" #include "os.h" -#include "user.h" #include <utime.h> static void stat64_to_hostfs(const struct stat64 *buf, struct hostfs_stat *p) |
