diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:15 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-26 04:22:59 -0400 |
| commit | 07f9479a40cc778bc1462ada11f95b01360ae4ff (patch) | |
| tree | 0676cf38df3844004bb3ebfd99dfa67a4a8998f5 /fs/exec.c | |
| parent | 9d5e6bdb3013acfb311ab407eeca0b6a6a3dedbf (diff) | |
| parent | cd2e49e90f1cae7726c9a2c54488d881d7f1cd1c (diff) | |
Merge branch 'master' into for-next
Fast-forwarded to current state of Linus' tree as there are patches to be
applied for files that didn't exist on the old branch.
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -1875,7 +1875,7 @@ static void wait_for_dump_helpers(struct file *file) | |||
| 1875 | 1875 | ||
| 1876 | 1876 | ||
| 1877 | /* | 1877 | /* |
| 1878 | * uhm_pipe_setup | 1878 | * umh_pipe_setup |
| 1879 | * helper function to customize the process used | 1879 | * helper function to customize the process used |
| 1880 | * to collect the core in userspace. Specifically | 1880 | * to collect the core in userspace. Specifically |
| 1881 | * it sets up a pipe and installs it as fd 0 (stdin) | 1881 | * it sets up a pipe and installs it as fd 0 (stdin) |