[PATCH] Documentation: Fix bad merge with tmpfile documentation

2013-07-16 Thread Jeff Mahoney
Commit 48bde8d3 (Document ->tmpfile()) had a bad merge in vfs.txt, where it put the new tmpfile prototype in the middle of the atomic_open prototype. Signed-off-by: Jeff Mahoney --- Documentation/filesystems/vfs.txt |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---

[PATCH] Documentation: Fix bad merge with tmpfile documentation

2013-07-16 Thread Jeff Mahoney
Commit 48bde8d3 (Document -tmpfile()) had a bad merge in vfs.txt, where it put the new tmpfile prototype in the middle of the atomic_open prototype. Signed-off-by: Jeff Mahoney je...@suse.com --- Documentation/filesystems/vfs.txt |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---