Commit Graph

117 Commits

Author SHA1 Message Date
Brian Behlendorf 313c01433d Remove add zfs_i18n dependency 2008-12-12 16:41:22 -08:00
Brian Behlendorf b62b4773d1 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-11 15:28:31 -08:00
Brian Behlendorf a2d1d32c17 move vdev_disk to it's new home 2008-12-11 15:26:36 -08:00
Brian Behlendorf 2c028659ab Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-11 15:00:19 -08:00
Brian Behlendorf 477a85d905 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 15:00:01 -08:00
Brian Behlendorf a3c66a6b89 Resolve conflict 2008-12-11 14:58:34 -08:00
Brian Behlendorf 593aa3e10d Move all current Makefiles to correct locations, updates still needed 2008-12-11 14:55:55 -08:00
Brian Behlendorf de2d4da1a4 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-11 11:37:26 -08:00
Brian Behlendorf 11e1ce8c2e Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-11 11:36:50 -08:00
Brian Behlendorf aca9d98817 Fix conflict 2008-12-11 11:34:16 -08:00
Brian Behlendorf 8aad84f781 Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch 2008-12-11 11:27:12 -08:00
Brian Behlendorf e152d6e601 Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb 2008-12-11 11:27:10 -08:00
Brian Behlendorf 756a122d37 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-11 11:25:42 -08:00
Brian Behlendorf 8f8ac4288f Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype 2008-12-11 11:25:09 -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 3420896332 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2008-12-11 11:24:42 -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