aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 12:06:16 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-04 12:06:16 -0400
commit4a61f17378c2cdd9bd8f34ef8bd7422861d0c1f1 (patch)
treea2054556900af8c16fd9f5419f012dcf1ee2995a /CREDITS
parentd002ec481c24f325ed6cfcb7810d317c015dd1b5 (diff)
parent7ecdb70a0ea436c06540140242bfac6ac3babfc0 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6: (292 commits) [GFS2] Fix endian bug for de_type [GFS2] Initialize SELinux extended attributes at inode creation time. [GFS2] Move logging code into log.c (mostly) [GFS2] Mark nlink cleared so VFS sees it happen [GFS2] Two redundant casts removed [GFS2] Remove uneeded endian conversion [GFS2] Remove duplicate sb reading code [GFS2] Mark metadata reads for blktrace [GFS2] Remove iflags.h, use FS_ [GFS2] Fix code style/indent in ops_file.c [GFS2] streamline-generic_file_-interfaces-and-filemap gfs fix [GFS2] Remove readv/writev methods and use aio_read/aio_write instead (gfs bits) [GFS2] inode-diet: Eliminate i_blksize from the inode structure [GFS2] inode_diet: Replace inode.u.generic_ip with inode.i_private (gfs) [GFS2] Fix typo in last patch [GFS2] Fix direct i/o logic in filemap.c [GFS2] Fix bug in Makefiles for lock modules [GFS2] Remove (extra) fs_subsys declaration [GFS2/DLM] Fix trailing whitespace [GFS2] Tidy up meta_io code ...
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS6
1 files changed, 3 insertions, 3 deletions
diff --git a/CREDITS b/CREDITS
index 5d75254bcb81..5329ead9c672 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3578,11 +3578,11 @@ S: Fargo, North Dakota 58122
3578S: USA 3578S: USA
3579 3579
3580N: Steven Whitehouse 3580N: Steven Whitehouse
3581E: SteveW@ACM.org 3581E: steve@chygwyn.com
3582W: http://www.chygwyn.com/~steve 3582W: http://www.chygwyn.com/~steve
3583D: Linux DECnet project: http://www.sucs.swan.ac.uk/~rohan/DECnet/index.html 3583D: Linux DECnet project
3584D: Minor debugging of other networking protocols. 3584D: Minor debugging of other networking protocols.
3585D: Misc bug fixes and filesystem development 3585D: Misc bug fixes and GFS2 filesystem development
3586 3586
3587N: Hans-Joachim Widmaier 3587N: Hans-Joachim Widmaier
3588E: hjw@zvw.de 3588E: hjw@zvw.de