3d1fcf35f6
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-14 16:28:30 -07:00
40624c07d0
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-14 16:28:29 -07:00
0d8be3d79e
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-14 16:28:23 -07:00
c2b056a4d7
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-14 16:28:21 -07:00
be39dadfb5
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-14 16:28:16 -07:00
b1a3dc7777
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-14 16:28:14 -07:00
20213dd6d6
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-14 16:28:09 -07:00
8fe5b9062b
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-08-14 16:28:07 -07:00
b6edc5c841
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-08-14 16:28:02 -07:00
32dabf5d24
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-08-14 16:28:00 -07:00
907d739b58
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-08-14 16:27:55 -07:00
10b124d62d
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-08-14 16:27:53 -07:00
9f261770b2
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-08-14 16:27:47 -07:00
6195d5f714
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-08-14 16:27:46 -07:00
38eb79e939
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-08-14 16:27:45 -07:00
97d125763b
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-08-14 16:27:35 -07:00
6201b22b50
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-08-14 16:27:34 -07:00
de4d7e0cb5
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-08-14 16:27:33 -07:00
e824f8baee
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-08-14 16:27:23 -07:00
f09d4f93c6
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-08-14 16:27:21 -07:00
64e1712b97
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-08-14 16:27:16 -07:00
4de8f39e3f
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-08-14 16:27:14 -07:00
c7673c8c1d
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
2009-08-14 16:27:09 -07:00
8d000a388e
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
2009-08-14 16:27:07 -07:00
ca092ec24b
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-08-14 16:27:01 -07:00
c646c4db32
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
2009-08-14 16:27:00 -07:00
1ed404e082
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-08-14 16:26:54 -07:00
2224cc3b14
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-08-14 16:26:53 -07:00
4e88845e13
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-08-14 16:26:47 -07:00
6e760bf59e
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-08-14 16:26:46 -07:00
6857a2e5a0
Various spec file tweaks to handle rpm building of several distros.
...
Supported and tested distros now include SLES10, SLES11, Chaos 4.x,
RHEL5, and Fedora 11. This update was mainly to address rebuildable
kernel module rpms, and correct rpm dependencies for each distro.
2009-08-14 16:22:20 -07:00
117bd44411
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
2009-08-14 10:26:31 -07:00
8b7ab832c1
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-08-14 10:26:23 -07:00
3e785cc085
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-08-14 10:26:14 -07:00
9a94206f03
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-08-14 10:26:12 -07:00
33815956f9
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-08-14 10:26:02 -07:00
720bca0b05
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-08-14 10:26:01 -07:00
9763b34ea8
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-08-14 10:25:51 -07:00
f1e231ab96
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-08-14 10:25:46 -07:00
fe5145a793
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-08-14 10:25:36 -07:00
a6d386daa3
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-08-14 10:25:35 -07:00
13b7c3ccb4
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-08-14 10:25:24 -07:00
61c813aae2
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-08-14 10:25:23 -07:00
57f858d502
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-08-14 10:25:13 -07:00
91f8f3fcf5
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-08-14 10:25:07 -07:00
c81b43a807
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-08-14 10:24:57 -07:00
96691c41af
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-08-14 10:24:56 -07:00
e58ddc434f
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-08-14 10:24:46 -07:00
44e8e1c855
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-08-14 10:24:44 -07:00
72510fc9d7
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-08-14 10:24:33 -07:00
Brian Behlendorf