diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 19:12:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-10 19:12:24 -0700 |
| commit | 04eef90c2e2fb860db71bff5f60d5ff0ec4c6dea (patch) | |
| tree | 0190a2610ade331b4be8e1efd094c0ad2b2ba181 /fs/exofs/dir.c | |
| parent | bb8ad2815a1210bfa56b8f8ebf0e40fbdf9198ff (diff) | |
| parent | bc47df0fa705887242c26c7b040e7cf0170ab1f1 (diff) | |
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
osdblk: Adjust queue limits to lower device's limits
osdblk: a Linux block device for OSD objects
MAINTAINERS: Add osd maintained files (F:)
exofs: Avoid using file_fsync()
exofs: Remove IBM copyrights
exofs: Fix bio leak in error handling path (sync read)
Diffstat (limited to 'fs/exofs/dir.c')
| -rw-r--r-- | fs/exofs/dir.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/exofs/dir.c b/fs/exofs/dir.c index 65b0c8c776a..4cfab1cc75c 100644 --- a/fs/exofs/dir.c +++ b/fs/exofs/dir.c @@ -1,8 +1,6 @@ /* * Copyright (C) 2005, 2006 - * Avishay Traeger (avishay@gmail.com) (avishay@il.ibm.com) - * Copyright (C) 2005, 2006 - * International Business Machines + * Avishay Traeger (avishay@gmail.com) * Copyright (C) 2008, 2009 * Boaz Harrosh <bharrosh@panasas.com> * |