diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-20 00:11:09 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-20 00:11:09 +0200 |
| commit | d471ce53b1fab60110e4e9f647a345cea31752de (patch) | |
| tree | 73acb87c823b63d026f9ba4617b5e112835d6abf /fs/btrfs/scrub.c | |
| parent | Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff) | |
| parent | um: remove dead code (diff) | |
| download | linux-d471ce53b1fab60110e4e9f647a345cea31752de.tar.xz linux-d471ce53b1fab60110e4e9f647a345cea31752de.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml
Pull UML fixes from Richard Weinberger:
"Special thanks goes to Toralf Föster for continuously testing UML and
reporting issues!"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
um: remove dead code
um: siginfo cleanup
uml: Fix which_tmpdir failure when /dev/shm is a symlink, and in other edge cases
um: Fix wait_stub_done() error handling
um: Mark stub pages mapping with VM_PFNMAP
um: Fix return value of strnlen_user()
Diffstat (limited to 'fs/btrfs/scrub.c')
0 files changed, 0 insertions, 0 deletions