Brian Behlendorf
|
93e36c1f27
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 17:01:22 -08:00 |
|
Brian Behlendorf
|
ab512fae44
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 17:01:15 -08:00 |
|
Brian Behlendorf
|
53e66eef5a
|
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
|
2008-12-17 17:01:14 -08:00 |
|
Brian Behlendorf
|
6e26929ddf
|
Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
|
2008-12-17 17:01:12 -08:00 |
|
Brian Behlendorf
|
206825be85
|
Merge commit 'refs/top-bases/gcc-branch' into gcc-branch
|
2008-12-17 17:01:10 -08:00 |
|
Brian Behlendorf
|
420137d529
|
Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch
|
2008-12-17 17:01:09 -08:00 |
|
Brian Behlendorf
|
194244b80b
|
Resolve read shadow conflict
|
2008-12-17 16:57:21 -08:00 |
|
Brian Behlendorf
|
6a1e1ed1d6
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:47:29 -08:00 |
|
Brian Behlendorf
|
f4d63a4cd4
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 16:47:26 -08:00 |
|
Brian Behlendorf
|
c969ed69c3
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:47:19 -08:00 |
|
Brian Behlendorf
|
c90836a39f
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 16:47:17 -08:00 |
|
Brian Behlendorf
|
677a057c0c
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:47:11 -08:00 |
|
Brian Behlendorf
|
f7f62a41ad
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 16:47:08 -08:00 |
|
Brian Behlendorf
|
128dc24d5f
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:47:03 -08:00 |
|
Brian Behlendorf
|
86bc861773
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 16:46:59 -08:00 |
|
Brian Behlendorf
|
57c38407e2
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:46:54 -08:00 |
|
Brian Behlendorf
|
12bb631814
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 16:46:52 -08:00 |
|
Brian Behlendorf
|
f0f8995040
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:46:46 -08:00 |
|
Brian Behlendorf
|
853f23dfa8
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 16:46:43 -08:00 |
|
Brian Behlendorf
|
5fbde0ff1c
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:46:36 -08:00 |
|
Brian Behlendorf
|
0eb2f9d596
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 16:46:32 -08:00 |
|
Brian Behlendorf
|
1889530985
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:46:25 -08:00 |
|
Brian Behlendorf
|
1106822c3a
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 16:46:21 -08:00 |
|
Brian Behlendorf
|
fc1a73bbaa
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:46:15 -08:00 |
|
Brian Behlendorf
|
58e5869872
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 16:46:10 -08:00 |
|
Brian Behlendorf
|
3a47419269
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:46:03 -08:00 |
|
Brian Behlendorf
|
56d78748f6
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 16:45:57 -08:00 |
|
Brian Behlendorf
|
973257dd77
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:45:50 -08:00 |
|
Brian Behlendorf
|
7053ff3e65
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 16:45:45 -08:00 |
|
Brian Behlendorf
|
75c5205c55
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:45:38 -08:00 |
|
Brian Behlendorf
|
672b1dff8e
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 16:45:35 -08:00 |
|
Brian Behlendorf
|
4e2d68af7e
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 16:45:33 -08:00 |
|
Brian Behlendorf
|
c93f62f798
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:45:21 -08:00 |
|
Brian Behlendorf
|
59f76052c1
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 16:45:17 -08:00 |
|
Brian Behlendorf
|
eb8725f0f8
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 16:45:15 -08:00 |
|
Brian Behlendorf
|
8a56924905
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:45:03 -08:00 |
|
Brian Behlendorf
|
9f46b34d31
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 16:44:58 -08:00 |
|
Brian Behlendorf
|
1fa8b21335
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:44:51 -08:00 |
|
Brian Behlendorf
|
6a79cb2d42
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 16:44:47 -08:00 |
|
Brian Behlendorf
|
6824e98d10
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:44:39 -08:00 |
|
Brian Behlendorf
|
95158f8107
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 16:44:35 -08:00 |
|
Brian Behlendorf
|
d4c38db06c
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:44:28 -08:00 |
|
Brian Behlendorf
|
67095edeaf
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 16:44:24 -08:00 |
|
Brian Behlendorf
|
75fd0ac353
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:44:17 -08:00 |
|
Brian Behlendorf
|
c61d06e903
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 16:44:13 -08:00 |
|
Brian Behlendorf
|
e9365e2338
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:44:06 -08:00 |
|
Brian Behlendorf
|
81e1e75f9f
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 16:44:01 -08:00 |
|
Brian Behlendorf
|
c27a2516c2
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 16:43:55 -08:00 |
|
Brian Behlendorf
|
5c10e449be
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 16:43:50 -08:00 |
|
Brian Behlendorf
|
f799177730
|
Add all sources for libzfs userspace funcationality
|
2008-12-17 16:39:45 -08:00 |