Brian Behlendorf
|
5dbfe7f0a8
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-24 10:35:49 -07:00 |
|
Brian Behlendorf
|
b49baa9a14
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:35:42 -07:00 |
|
Brian Behlendorf
|
9e85d01059
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-24 10:35:32 -07:00 |
|
Brian Behlendorf
|
78372f93e1
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:35:24 -07:00 |
|
Brian Behlendorf
|
d7cafc2f4c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-24 10:35:22 -07:00 |
|
Brian Behlendorf
|
5bd7603f1d
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:35:14 -07:00 |
|
Brian Behlendorf
|
50d6e87fed
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2009-07-24 10:35:12 -07:00 |
|
Brian Behlendorf
|
7e710158f3
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:35:04 -07:00 |
|
Brian Behlendorf
|
e09a06470b
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2009-07-24 10:35:02 -07:00 |
|
Brian Behlendorf
|
bdd06a991d
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:34:53 -07:00 |
|
Brian Behlendorf
|
77850c1be0
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2009-07-24 10:34:51 -07:00 |
|
Brian Behlendorf
|
df32e527b2
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:34:43 -07:00 |
|
Brian Behlendorf
|
a9c1fe5176
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2009-07-24 10:34:41 -07:00 |
|
Brian Behlendorf
|
ca6c7597a7
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2009-07-24 10:34:40 -07:00 |
|
Brian Behlendorf
|
6648520d09
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:34:20 -07:00 |
|
Brian Behlendorf
|
454bc53308
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2009-07-24 10:34:18 -07:00 |
|
Brian Behlendorf
|
e8c659fa2b
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2009-07-24 10:34:17 -07:00 |
|
Brian Behlendorf
|
350180f216
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:34:01 -07:00 |
|
Brian Behlendorf
|
0ac359d5b8
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2009-07-24 10:33:59 -07:00 |
|
Brian Behlendorf
|
9bec15f58a
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:33:51 -07:00 |
|
Brian Behlendorf
|
5172d53293
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2009-07-24 10:33:45 -07:00 |
|
Brian Behlendorf
|
992e4de3b5
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:33:35 -07:00 |
|
Brian Behlendorf
|
ae27c901f6
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2009-07-24 10:33:33 -07:00 |
|
Brian Behlendorf
|
0580caa069
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:33:24 -07:00 |
|
Brian Behlendorf
|
0a46fc74ee
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2009-07-24 10:33:22 -07:00 |
|
Brian Behlendorf
|
a1cca5f70f
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:33:14 -07:00 |
|
Brian Behlendorf
|
334fa41e4b
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2009-07-24 10:33:09 -07:00 |
|
Brian Behlendorf
|
7722506c06
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:33:01 -07:00 |
|
Brian Behlendorf
|
c69c537653
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2009-07-24 10:32:59 -07:00 |
|
Brian Behlendorf
|
a66be0122f
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2009-07-24 10:32:50 -07:00 |
|
Brian Behlendorf
|
1ae0a161a2
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2009-07-24 10:32:48 -07:00 |
|
Brian Behlendorf
|
710c21f2e9
|
Use LOSETUP variable for all calls to /sbin/losetup
|
2009-07-24 10:25:01 -07:00 |
|
Brian Behlendorf
|
ae97f87362
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2009-07-24 09:19:57 -07:00 |
|
Brian Behlendorf
|
dfbfdad242
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2009-07-24 09:19:55 -07:00 |
|
Brian Behlendorf
|
2d71a4dc6e
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2009-07-24 09:19:47 -07:00 |
|
Brian Behlendorf
|
8ca0e866d0
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2009-07-24 09:19:45 -07:00 |
|
Brian Behlendorf
|
95fee56913
|
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
|
2009-07-24 09:19:36 -07:00 |
|
Brian Behlendorf
|
cbb3788214
|
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
|
2009-07-24 09:19:34 -07:00 |
|
Brian Behlendorf
|
b81daaee5b
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2009-07-24 09:19:26 -07:00 |
|
Brian Behlendorf
|
c24f3b11a2
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2009-07-24 09:19:24 -07:00 |
|
Brian Behlendorf
|
03e6e3041c
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2009-07-24 09:19:15 -07:00 |
|
Brian Behlendorf
|
a65ba1acc5
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2009-07-24 09:19:12 -07:00 |
|
Brian Behlendorf
|
6905f9be00
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2009-07-24 09:19:02 -07:00 |
|
Brian Behlendorf
|
96e22edddd
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2009-07-24 09:19:00 -07:00 |
|
Brian Behlendorf
|
65bf4a9b26
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2009-07-24 09:18:52 -07:00 |
|
Brian Behlendorf
|
8f1db6316f
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2009-07-24 09:18:50 -07:00 |
|
Brian Behlendorf
|
447f8fe412
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2009-07-24 09:18:41 -07:00 |
|
Brian Behlendorf
|
4865f95281
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2009-07-24 09:18:39 -07:00 |
|
Brian Behlendorf
|
a954b68a45
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2009-07-24 09:18:31 -07:00 |
|
Brian Behlendorf
|
35b101b8d1
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2009-07-24 09:18:29 -07:00 |