Brian Behlendorf
|
f868562fd4
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:42:33 -07:00 |
|
Brian Behlendorf
|
0af48bcf91
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-10-09 16:42:31 -07:00 |
|
Brian Behlendorf
|
b4a732e620
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:42:25 -07:00 |
|
Brian Behlendorf
|
c4dff3c807
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-10-09 16:42:23 -07:00 |
|
Brian Behlendorf
|
7303103ba3
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:42:17 -07:00 |
|
Brian Behlendorf
|
21760bde77
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-10-09 16:42:15 -07:00 |
|
Brian Behlendorf
|
8b6b31f3e4
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:42:09 -07:00 |
|
Brian Behlendorf
|
4d7417c7f1
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-10-09 16:42:07 -07:00 |
|
Brian Behlendorf
|
cb91bbe6ce
|
Additional set of build system tweaks for libefi library.
|
2009-10-09 16:37:32 -07:00 |
|
Brian Behlendorf
|
cae4a99504
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:23:13 -07:00 |
|
Brian Behlendorf
|
d7e242199c
|
Header efi_partition.h moved to lib/libefi/include/sys/
|
2009-10-09 16:18:39 -07:00 |
|
Brian Behlendorf
|
633756f923
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:13:28 -07:00 |
|
Brian Behlendorf
|
95e303206a
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-10-09 16:13:26 -07:00 |
|
Brian Behlendorf
|
6d86581b5a
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:13:21 -07:00 |
|
Brian Behlendorf
|
c2aea3611b
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-10-09 16:13:19 -07:00 |
|
Brian Behlendorf
|
3980bce9d4
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:13:13 -07:00 |
|
Brian Behlendorf
|
caed68da36
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-10-09 16:13:11 -07:00 |
|
Brian Behlendorf
|
453936b47c
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:13:05 -07:00 |
|
Brian Behlendorf
|
3b62dfad5c
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-10-09 16:13:03 -07:00 |
|
Brian Behlendorf
|
85583ef387
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:12:57 -07:00 |
|
Brian Behlendorf
|
fc2213dfac
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
Conflicts:
lib/Makefile.am
|
2009-10-09 16:12:49 -07:00 |
|
Brian Behlendorf
|
9b0ece49a4
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:10:04 -07:00 |
|
Brian Behlendorf
|
8fbaf287d7
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-10-09 16:10:02 -07:00 |
|
Brian Behlendorf
|
1fe3d2fd7b
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:09:56 -07:00 |
|
Brian Behlendorf
|
7c073d0a7d
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-10-09 16:09:54 -07:00 |
|
Brian Behlendorf
|
42e6947436
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:09:48 -07:00 |
|
Brian Behlendorf
|
ce6ad30cbb
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-10-09 16:09:46 -07:00 |
|
Brian Behlendorf
|
872d3f202f
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:09:40 -07:00 |
|
Brian Behlendorf
|
2001a56428
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-10-09 16:09:38 -07:00 |
|
Brian Behlendorf
|
1cacce9e7d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:09:32 -07:00 |
|
Brian Behlendorf
|
040e6c020f
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-10-09 16:09:30 -07:00 |
|
Brian Behlendorf
|
66ccf80585
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:09:24 -07:00 |
|
Brian Behlendorf
|
e9a58f7148
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-10-09 16:09:22 -07:00 |
|
Brian Behlendorf
|
fbd385e311
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:09:16 -07:00 |
|
Brian Behlendorf
|
f0e7c21dfc
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-10-09 16:09:14 -07:00 |
|
Brian Behlendorf
|
9a91c646b3
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:09:08 -07:00 |
|
Brian Behlendorf
|
4093dd012f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-10-09 16:09:07 -07:00 |
|
Brian Behlendorf
|
b01738b4aa
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-10-09 16:09:06 -07:00 |
|
Brian Behlendorf
|
e59921aa80
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:08:55 -07:00 |
|
Brian Behlendorf
|
8ca9436915
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-10-09 16:08:53 -07:00 |
|
Brian Behlendorf
|
60f818719c
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-10-09 16:08:52 -07:00 |
|
Brian Behlendorf
|
64e3eb8a79
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:08:41 -07:00 |
|
Brian Behlendorf
|
a84ca33e2f
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-10-09 16:08:40 -07:00 |
|
Brian Behlendorf
|
6ba2029a1e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:08:34 -07:00 |
|
Brian Behlendorf
|
1167bd1a6e
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-10-09 16:08:32 -07:00 |
|
Brian Behlendorf
|
179535aac3
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:08:26 -07:00 |
|
Brian Behlendorf
|
2fbcf94bce
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-10-09 16:08:24 -07:00 |
|
Brian Behlendorf
|
8cafc7c6da
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-10-09 16:08:19 -07:00 |
|
Brian Behlendorf
|
1bee1a4dda
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-10-09 16:08:17 -07:00 |
|
Brian Behlendorf
|
a740d2a8f7
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:
lib/Makefile.am
|
2009-10-09 16:06:51 -07:00 |