Commit Graph

16 Commits

Author SHA1 Message Date
Brian Behlendorf 9ad0fef49e Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch
Conflicts:

	module/nvpair/nvpair.c
2009-07-09 13:08:30 -07:00
Brian Behlendorf 683b2f0d00 TopGit missed this update when I updated the same line in the
gcc-unused and gcc-uninit topic branches at the same time and
then ran 'tg update'.  I'll need to keep that sort of thing
in mind when updating multiple topic branches between updates.
2009-07-09 13:07:05 -07:00
Brian Behlendorf 76bf02aebb Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-07-09 12:23:36 -07:00
Brian Behlendorf a551134b2f Unitialized variables should be handled in the gcc-uninit topic branch. 2009-07-09 12:14:56 -07:00
Brian Behlendorf a19906fe65 Unitialized variables should be handled in the gcc-uninit topic branch. 2009-07-09 12:13:56 -07:00
Brian Behlendorf ced9992186 Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2009-03-11 12:43:28 -07:00
Brian Behlendorf fbb2843086 Ensure idx is properly initialized in all instances. 2009-03-11 12:34:24 -07:00
Brian Behlendorf 8fe801fd8f Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch 2009-03-11 11:00:42 -07:00
Ricardo M. Correia af45030850 Added 'gcc-ident-pragmas' branch. 2009-03-11 10:59:45 -07:00
Brian Behlendorf 0595328655 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 14:25:03 -08:00
Brian Behlendorf 82c8f9af50 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 14:24:49 -08:00
Brian Behlendorf a4076c7544 Script updates 2008-12-11 14:21:14 -08:00
Brian Behlendorf c4911ece24 Move library files to lib 2008-12-11 14:16:55 -08:00
Brian Behlendorf 3f25e7cd69 Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 11:25:34 -08:00
Brian Behlendorf 4f5d567cfd Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-11 11:24:45 -08:00
Brian Behlendorf 172bb4bd5e Move the world out of /zfs/ and seperate out module build tree 2008-12-11 11:08:09 -08:00