Brian Behlendorf
d6c7466819
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-21 15:59:39 -07:00
Brian Behlendorf
e811cc6ec4
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-21 15:59:16 -07:00
Brian Behlendorf
4dcbc1fc67
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-21 15:59:14 -07:00
Brian Behlendorf
f9cb9780a0
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-21 15:58:50 -07:00
Brian Behlendorf
1d5ebc3210
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-21 15:58:48 -07:00
Brian Behlendorf
b8b1cb618a
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-21 15:58:25 -07:00
Brian Behlendorf
08742b5020
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-21 15:58:23 -07:00
Brian Behlendorf
2ae2dcb003
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-21 15:58:00 -07:00
Brian Behlendorf
f1d064c189
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-21 15:57:58 -07:00
Brian Behlendorf
c0c868786a
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-21 15:57:34 -07:00
Brian Behlendorf
db6b5f7482
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-21 15:57:32 -07:00
Brian Behlendorf
0da4c91191
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-21 15:57:09 -07:00
Brian Behlendorf
86e1295b79
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-21 15:57:07 -07:00
Brian Behlendorf
6c054707ce
Remove TODO file for spec file.
2010-05-21 15:40:24 -07:00
Brian Behlendorf
d653a1b8e3
Merge commit 'refs/top-bases/top' into top
2010-05-21 15:37:12 -07:00
Brian Behlendorf
e3a272f273
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2010-05-21 15:37:10 -07:00
Brian Behlendorf
3baeaf3343
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2010-05-21 15:37:08 -07:00
Brian Behlendorf
08f8d79beb
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
2010-05-21 15:37:07 -07:00
Brian Behlendorf
a8438870bb
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
2010-05-21 15:37:05 -07:00
Brian Behlendorf
375f0e4db1
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
2010-05-21 15:36:42 -07:00
Brian Behlendorf
e781854469
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2010-05-21 15:36:39 -07:00
Brian Behlendorf
ecebeeb7e5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2010-05-21 15:36:38 -07:00
Brian Behlendorf
542052314e
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
2010-05-21 15:35:53 -07:00
Brian Behlendorf
02d1ad4f15
Merge commit 'refs/top-bases/linux-events' into linux-events
2010-05-21 15:35:50 -07:00
Brian Behlendorf
8f1882a06e
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
2010-05-21 15:35:27 -07:00
Brian Behlendorf
4683da31f6
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
2010-05-21 15:35:25 -07:00
Brian Behlendorf
c01ea509f6
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2010-05-21 15:35:02 -07:00
Brian Behlendorf
5e4314a4ed
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2010-05-21 15:35:00 -07:00
Brian Behlendorf
29d01df48d
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2010-05-21 15:34:37 -07:00
Brian Behlendorf
8ad18a3e74
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2010-05-21 15:34:34 -07:00
Brian Behlendorf
2468e6d67d
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2010-05-21 15:34:11 -07:00
Brian Behlendorf
230510ddac
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2010-05-21 15:34:09 -07:00
Brian Behlendorf
3e2e28cfa3
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2010-05-21 15:33:46 -07:00
Brian Behlendorf
ac1868953c
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-21 15:33:44 -07:00
Brian Behlendorf
bcc7d1c258
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2010-05-21 15:33:21 -07:00
Brian Behlendorf
3fd78da576
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2010-05-21 15:33:18 -07:00
Brian Behlendorf
fa51680025
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2010-05-21 15:32:55 -07:00
Brian Behlendorf
c52e9f28a4
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2010-05-21 15:32:53 -07:00
Brian Behlendorf
45c88a2f20
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2010-05-21 15:32:29 -07:00
Brian Behlendorf
909c60e23f
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2010-05-21 15:32:27 -07:00
Brian Behlendorf
35c46bb0e5
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2010-05-21 15:32:04 -07:00
Brian Behlendorf
ea5ced8e55
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2010-05-21 15:32:02 -07:00
Brian Behlendorf
af12c8fa08
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2010-05-21 15:31:38 -07:00
Brian Behlendorf
4529531127
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2010-05-21 15:31:36 -07:00
Brian Behlendorf
77b2f748a0
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2010-05-21 15:31:12 -07:00
Brian Behlendorf
08a4e1267d
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2010-05-21 15:31:10 -07:00
Brian Behlendorf
733007a14c
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2010-05-21 15:30:47 -07:00
Brian Behlendorf
b9eb575992
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2010-05-21 15:30:45 -07:00
Brian Behlendorf
84c7c5fb58
Prep for 0.4.9 tag update META, README, ChangeLog.
...
Updated README to reflect the current state of the project and to
be less developer focused. It now simply includes basic build
instructions for packages and little example of some of the cool
things you can do.
Also remove the out of data TODO file. This sort of thing can
and be tracked on the GitHub issue tracker.
2010-05-21 15:11:49 -07:00
Brian Behlendorf
4221c8cf93
Minor spec file cleanup for RHEL6 package dependency.
2010-05-21 15:08:08 -07:00
