Commit Graph

1041 Commits

Author SHA1 Message Date
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 ad4ff5d2f5 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2008-12-12 13:46:20 -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 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 be42a7683a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 12:15:50 -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 0d8f315e3d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 11:07:28 -08:00
Brian Behlendorf ded433714f Refine Makefiles 2008-12-12 11:04:44 -08:00
Brian Behlendorf 78eed11ed5 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 10:59:46 -08:00
Brian Behlendorf 9fbc572a59 Refine Makefiles 2008-12-12 10:57:05 -08:00
Brian Behlendorf d2b8537008 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 10:45:16 -08:00
Brian Behlendorf d7ec1ed532 Refine Makefiles 2008-12-12 10:43:39 -08:00
Brian Behlendorf d60f962547 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 10:38:30 -08:00
Brian Behlendorf 76e1c54125 Refine Makefiles 2008-12-12 10:36:14 -08:00
Brian Behlendorf 127459b37c Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 10:30:17 -08:00
Brian Behlendorf f429331a49 Remove redundant build options 2008-12-12 10:27:10 -08:00
Brian Behlendorf 7609f8a3b1 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 10:18:39 -08:00
Brian Behlendorf 2d5777f9a7 Use AM_CFLAGS 2008-12-12 10:15:59 -08:00
Brian Behlendorf 5bf6663ecb Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 10:12:59 -08:00
Brian Behlendorf 6d78e69193 Add missing include patch 2008-12-12 10:10:16 -08:00
Brian Behlendorf f19b3228d3 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 09:23:16 -08:00
Brian Behlendorf 7005de9a0c Refresh Makefile.am's 2008-12-12 09:20:33 -08:00
Brian Behlendorf 72ff1d0707 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-12 08:53:11 -08:00
Brian Behlendorf d4ae03c700 Add initial stub makefile, details need filling in 2008-12-12 08:50:07 -08:00
Brian Behlendorf 3bc69462ea Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-11 16:56:50 -08:00
Brian Behlendorf f55d6ad125 Remove bugus checks for now 2008-12-11 16:51:09 -08:00
Brian Behlendorf 8f77804814 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-11 16:34:57 -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
Brian Behlendorf 66b04c1abb Merge commit 'refs/top-bases/gcc-unused' into gcc-unused 2008-12-11 15:41:46 -08:00
Brian Behlendorf d35a0f25fe Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit 2008-12-11 15:41:45 -08:00
Brian Behlendorf bb92f42dba Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch 2008-12-11 15:41:45 -08:00
Brian Behlendorf 63d6795628 Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2008-12-11 15:41:43 -08:00
Brian Behlendorf dd32efe6ef Resolve conflict 2008-12-11 15:41:42 -08:00