Brian Behlendorf
|
a5041b8a4d
|
Merge commit 'refs/remotes/origin/linux-kernel-disk' into HEAD
|
2009-06-26 14:35:08 -07:00 |
|
Brian Behlendorf
|
14d0582ab3
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-06-26 14:35:03 -07:00 |
|
Brian Behlendorf
|
73a044f416
|
Merge commit 'refs/remotes/origin/linux-have-zvol' into HEAD
|
2009-06-26 14:35:02 -07:00 |
|
Brian Behlendorf
|
5e095eef60
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-06-26 14:34:57 -07:00 |
|
Brian Behlendorf
|
514f9f626c
|
Merge commit 'refs/remotes/origin/linux-have-uio-rw' into HEAD
|
2009-06-26 14:34:55 -07:00 |
|
Brian Behlendorf
|
af590ac979
|
Merge commit 'refs/remotes/origin/linux-debug-zerocopy' into HEAD
|
2009-06-26 14:34:54 -07:00 |
|
Brian Behlendorf
|
5f118cd8c3
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-06-26 14:34:47 -07:00 |
|
Brian Behlendorf
|
a55e2314db
|
Merge commit 'refs/remotes/origin/linux-have-sysevent' into HEAD
|
2009-06-26 14:34:45 -07:00 |
|
Brian Behlendorf
|
ddbb1fcb7c
|
Merge commit 'refs/remotes/origin/linux-kernel-module' into HEAD
|
2009-06-26 14:34:44 -07:00 |
|
Brian Behlendorf
|
9be93eff64
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-06-26 14:34:36 -07:00 |
|
Brian Behlendorf
|
393aa038a5
|
Merge commit 'refs/remotes/origin/linux-have-spl-debug' into HEAD
|
2009-06-26 14:34:34 -07:00 |
|
Brian Behlendorf
|
825dd644ac
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-06-26 14:34:30 -07:00 |
|
Brian Behlendorf
|
a799d209d3
|
Merge commit 'refs/remotes/origin/linux-have-mntent' into HEAD
|
2009-06-26 14:34:28 -07:00 |
|
Brian Behlendorf
|
e367623fe1
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-06-26 14:34:24 -07:00 |
|
Brian Behlendorf
|
a3521786e6
|
Merge commit 'refs/remotes/origin/linux-have-libefi' into HEAD
|
2009-06-26 14:34:22 -07:00 |
|
Brian Behlendorf
|
ce298cb14f
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-06-26 14:34:17 -07:00 |
|
Brian Behlendorf
|
4d27fc5ab2
|
Merge commit 'refs/remotes/origin/linux-have-libdiskmgt' into HEAD
|
2009-06-26 14:34:15 -07:00 |
|
Brian Behlendorf
|
3701134482
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-06-26 14:34:10 -07:00 |
|
Brian Behlendorf
|
500148acb5
|
Merge commit 'refs/remotes/origin/linux-have-fm' into HEAD
|
2009-06-26 14:34:08 -07:00 |
|
Brian Behlendorf
|
c0a133242a
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-06-26 14:34:03 -07:00 |
|
Brian Behlendorf
|
69190e6942
|
Merge commit 'refs/remotes/origin/linux-docs' into HEAD
|
2009-06-26 14:34:01 -07:00 |
|
Brian Behlendorf
|
245c8d5573
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-06-26 14:33:55 -07:00 |
|
Brian Behlendorf
|
828c40160d
|
Merge commit 'refs/remotes/origin/linux-arc' into HEAD
|
2009-06-26 14:33:54 -07:00 |
|
Brian Behlendorf
|
4fbded409d
|
Merge commit '0f1012be0aeb6f5f27966c80321db79a9b1aaec3' into zfs-branch
|
2009-06-26 14:33:53 -07:00 |
|
Brian Behlendorf
|
137276e3c9
|
Should be powerpc64 not powerpc (powerpc is unsupported)
|
2009-06-26 14:29:42 -07:00 |
|
Brian Behlendorf
|
2c935abd54
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:34:10 -07:00 |
|
Brian Behlendorf
|
f4d3e57045
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-06-09 16:34:05 -07:00 |
|
Brian Behlendorf
|
15793095a5
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:33:42 -07:00 |
|
Brian Behlendorf
|
5fb4aee581
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-06-09 16:33:37 -07:00 |
|
Brian Behlendorf
|
9055596072
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:33:15 -07:00 |
|
Brian Behlendorf
|
c5e17444a2
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-06-09 16:33:10 -07:00 |
|
Brian Behlendorf
|
3c469c420e
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:32:51 -07:00 |
|
Brian Behlendorf
|
672e356372
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-06-09 16:32:47 -07:00 |
|
Brian Behlendorf
|
31d2821b1d
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:32:23 -07:00 |
|
Brian Behlendorf
|
a013a22d95
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-06-09 16:32:19 -07:00 |
|
Brian Behlendorf
|
2ba46cd48c
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:31:56 -07:00 |
|
Brian Behlendorf
|
ea175483f6
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-06-09 16:31:50 -07:00 |
|
Brian Behlendorf
|
9c2952090d
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:31:25 -07:00 |
|
Brian Behlendorf
|
dfc5c402b4
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-06-09 16:31:20 -07:00 |
|
Brian Behlendorf
|
6496d1dae2
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:30:59 -07:00 |
|
Brian Behlendorf
|
14f84d58a3
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-06-09 16:30:53 -07:00 |
|
Brian Behlendorf
|
1f02cafed6
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:30:32 -07:00 |
|
Brian Behlendorf
|
62ca1a6613
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-06-09 16:30:27 -07:00 |
|
Brian Behlendorf
|
7b675ba821
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:30:07 -07:00 |
|
Brian Behlendorf
|
83de6db13f
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-06-09 16:30:02 -07:00 |
|
Brian Behlendorf
|
4bc277110c
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:29:42 -07:00 |
|
Brian Behlendorf
|
4c61227c5c
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-06-09 16:29:35 -07:00 |
|
Brian Behlendorf
|
12d9ffd69e
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-06-09 16:29:15 -07:00 |
|
Brian Behlendorf
|
d3359d6962
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-06-09 16:29:11 -07:00 |
|
Brian Behlendorf
|
40b96b2853
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-06-09 16:29:09 -07:00 |