Commit Graph

1247 Commits

Author SHA1 Message Date
Brian Behlendorf 9d5295298d Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2008-12-12 13:46:27 -08:00
Brian Behlendorf 4b741e6dd5 Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-12 13:46:25 -08:00
Brian Behlendorf 7fd3f6d8b9 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-12 13:46:25 -08:00
Brian Behlendorf 295cf87bbd Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2008-12-12 13:46:24 -08:00
Brian Behlendorf d941b8ec9c Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2008-12-12 13:46:23 -08:00
Brian Behlendorf bdb0f362c3 Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2008-12-12 13:46:22 -08:00
Brian Behlendorf b00eb5c285 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2008-12-12 13:46:22 -08:00
Brian Behlendorf 16ad896509 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2008-12-12 13:46:20 -08:00
Brian Behlendorf ad4ff5d2f5 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-12 13:46:20 -08:00
Brian Behlendorf 6bd1d4e45c Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2008-12-12 13:46:19 -08:00
Brian Behlendorf 7c63b600b1 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-12 13:46:18 -08:00
Brian Behlendorf 810db7e0a2 Remove zcommon reference merged in to zpool 2008-12-12 13:41:20 -08:00
Brian Behlendorf 8136621404 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 12:15:41 -08:00
Brian Behlendorf ac9f5a5af0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-12 12:13:43 -08:00
Brian Behlendorf 0f99484285 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-12 12:13:41 -08:00
Brian Behlendorf e1db87107d Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-12 12:13:40 -08:00
Brian Behlendorf 95f0795156 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-12 12:13:39 -08:00
Brian Behlendorf ea6e9380e7 Add void to prototype 2008-12-12 11:12:11 -08:00
Brian Behlendorf 4e3a43cb70 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 11:07:24 -08:00
Brian Behlendorf ded433714f Refine Makefiles 2008-12-12 11:04:44 -08:00
Brian Behlendorf be2a436e28 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 10:59:42 -08:00
Brian Behlendorf 9fbc572a59 Refine Makefiles 2008-12-12 10:57:05 -08:00
Brian Behlendorf a0ba063d33 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 10:45:12 -08:00
Brian Behlendorf d7ec1ed532 Refine Makefiles 2008-12-12 10:43:39 -08:00
Brian Behlendorf 298c3e1736 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 10:38:26 -08:00
Brian Behlendorf 76e1c54125 Refine Makefiles 2008-12-12 10:36:14 -08:00
Brian Behlendorf c8ab2566a1 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 10:30:12 -08:00
Brian Behlendorf f429331a49 Remove redundant build options 2008-12-12 10:27:10 -08:00
Brian Behlendorf 929a8cdb72 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 10:18:35 -08:00
Brian Behlendorf 2d5777f9a7 Use AM_CFLAGS 2008-12-12 10:15:59 -08:00
Brian Behlendorf 557f7962ee Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 10:12:54 -08:00
Brian Behlendorf 6d78e69193 Add missing include patch 2008-12-12 10:10:16 -08:00
Brian Behlendorf e4f01701a9 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 09:23:12 -08:00
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf 999bdbb6ac Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-12 08:53:07 -08:00
Brian Behlendorf d4ae03c700 Add initial stub makefile, details need filling in 2008-12-12 08:50:07 -08:00
Brian Behlendorf 6b0a5d9826 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-11 16:56:41 -08:00
Brian Behlendorf f55d6ad125 Remove bugus checks for now 2008-12-11 16:51:09 -08:00
Brian Behlendorf 85ddb2d6c0 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-11 16:34:51 -08:00
Brian Behlendorf e4fae8e3d4 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2008-12-11 15:41:52 -08:00
Brian Behlendorf a0e625a878 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 15:41:52 -08:00
Brian Behlendorf eefa9ab3ab Merge commit 'refs/top-bases/feature-branch' into feature-branch 2008-12-11 15:41:51 -08:00
Brian Behlendorf 2308a268a5 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 15:41:51 -08:00
Brian Behlendorf 12389cbaaf Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2008-12-11 15:41:51 -08:00
Brian Behlendorf 843ecec587 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 15:41:50 -08:00
Brian Behlendorf a557668285 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 15:41:49 -08:00
Brian Behlendorf 9e0b8ff76f Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-11 15:41:48 -08:00
Brian Behlendorf 182754d11a Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 15:41:48 -08:00
Brian Behlendorf a442f70b33 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-11 15:41:47 -08:00
Brian Behlendorf c41f16e355 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2008-12-11 15:41:47 -08:00