diff options
| author | Mark Brown <broonie@linaro.org> | 2014-04-29 13:01:28 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-04-29 13:01:28 -0400 |
| commit | 3e93457b45a1a8c69227ce596ee2005fa06f20dd (patch) | |
| tree | 248c27e432533b1af80a9b2240eaa8e48e3b87cc /mm/filemap.c | |
| parent | 290414499cf94284a97cc3c33214d13ccfcd896a (diff) | |
| parent | c42ba72ec3a7a1b6aa30122931f1f4b91b601c31 (diff) | |
Merge tag 'ib-mfd-regulator-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd into regulator-tps65090
Immutable branch between MFD and Regulator due for v3.16 merge-window.
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mm/filemap.c b/mm/filemap.c index a82fbe4c9e8e..5020b280a771 100644 --- a/mm/filemap.c +++ b/mm/filemap.c | |||
| @@ -2581,7 +2581,6 @@ EXPORT_SYMBOL(generic_perform_write); | |||
| 2581 | * @iocb: IO state structure (file, offset, etc.) | 2581 | * @iocb: IO state structure (file, offset, etc.) |
| 2582 | * @iov: vector with data to write | 2582 | * @iov: vector with data to write |
| 2583 | * @nr_segs: number of segments in the vector | 2583 | * @nr_segs: number of segments in the vector |
| 2584 | * @ppos: position where to write | ||
| 2585 | * | 2584 | * |
| 2586 | * This function does all the work needed for actually writing data to a | 2585 | * This function does all the work needed for actually writing data to a |
| 2587 | * file. It does all basic checks, removes SUID from the file, updates | 2586 | * file. It does all basic checks, removes SUID from the file, updates |