Brian Behlendorf
|
4b4c5b39a5
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-05-21 16:48:08 -07:00 |
|
Brian Behlendorf
|
79c5d5c058
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-05-21 16:48:06 -07:00 |
|
Brian Behlendorf
|
5da0e30597
|
Ensure COPYRIGHT file is included in the package.
|
2010-05-21 16:34:38 -07:00 |
|
Brian Behlendorf
|
bbe900639c
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-05-21 16:03:26 -07:00 |
|
Brian Behlendorf
|
84329e8f52
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-05-21 16:03:24 -07:00 |
|
Brian Behlendorf
|
b733d56c56
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-21 16:03:01 -07:00 |
|
Brian Behlendorf
|
2f4021b354
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-21 16:02:59 -07:00 |
|
Brian Behlendorf
|
f0c0fc4254
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-05-21 16:02:58 -07:00 |
|
Brian Behlendorf
|
0f03a01b90
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-21 16:02:13 -07:00 |
|
Brian Behlendorf
|
a8ac8075fc
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-21 16:02:10 -07:00 |
|
Brian Behlendorf
|
cb26437568
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-21 16:01:47 -07:00 |
|
Brian Behlendorf
|
666f2c10af
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-21 16:01:45 -07:00 |
|
Brian Behlendorf
|
7e737dc34b
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-21 16:01:22 -07:00 |
|
Brian Behlendorf
|
f69dd0d01c
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-21 16:01:20 -07:00 |
|
Brian Behlendorf
|
6a8249a044
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-05-21 16:00:57 -07:00 |
|
Brian Behlendorf
|
520a1fc84c
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-21 16:00:54 -07:00 |
|
Brian Behlendorf
|
c6c24585cc
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-05-21 16:00:31 -07:00 |
|
Brian Behlendorf
|
599ad31ef3
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-05-21 16:00:29 -07:00 |
|
Brian Behlendorf
|
ce6054634b
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2010-05-21 16:00:06 -07:00 |
|
Brian Behlendorf
|
2e31280e0a
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2010-05-21 16:00:04 -07:00 |
|
Brian Behlendorf
|
cd8e281ed2
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:59:41 -07:00 |
|
Brian Behlendorf
|
d6c7466819
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2010-05-21 15:59:39 -07:00 |
|
Brian Behlendorf
|
e811cc6ec4
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:59:16 -07:00 |
|
Brian Behlendorf
|
4dcbc1fc67
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2010-05-21 15:59:14 -07:00 |
|
Brian Behlendorf
|
f9cb9780a0
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:58:50 -07:00 |
|
Brian Behlendorf
|
1d5ebc3210
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2010-05-21 15:58:48 -07:00 |
|
Brian Behlendorf
|
b8b1cb618a
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:58:25 -07:00 |
|
Brian Behlendorf
|
08742b5020
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2010-05-21 15:58:23 -07:00 |
|
Brian Behlendorf
|
2ae2dcb003
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:58:00 -07:00 |
|
Brian Behlendorf
|
f1d064c189
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2010-05-21 15:57:58 -07:00 |
|
Brian Behlendorf
|
c0c868786a
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:57:34 -07:00 |
|
Brian Behlendorf
|
db6b5f7482
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2010-05-21 15:57:32 -07:00 |
|
Brian Behlendorf
|
0da4c91191
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:57:09 -07:00 |
|
Brian Behlendorf
|
86e1295b79
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2010-05-21 15:57:07 -07:00 |
|
Brian Behlendorf
|
6c054707ce
|
Remove TODO file for spec file.
|
2010-05-21 15:40:24 -07:00 |
|
Brian Behlendorf
|
08f8d79beb
|
Merge branch 'linux-user-util' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:37:07 -07:00 |
|
Brian Behlendorf
|
a8438870bb
|
Merge commit 'refs/top-bases/linux-user-util' into linux-user-util
|
2010-05-21 15:37:05 -07:00 |
|
Brian Behlendorf
|
375f0e4db1
|
Merge branch 'linux-debug-zerocopy' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:36:42 -07:00 |
|
Brian Behlendorf
|
e781854469
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2010-05-21 15:36:39 -07:00 |
|
Brian Behlendorf
|
ecebeeb7e5
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2010-05-21 15:36:38 -07:00 |
|
Brian Behlendorf
|
542052314e
|
Merge branch 'linux-events' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:35:53 -07:00 |
|
Brian Behlendorf
|
02d1ad4f15
|
Merge commit 'refs/top-bases/linux-events' into linux-events
|
2010-05-21 15:35:50 -07:00 |
|
Brian Behlendorf
|
8f1882a06e
|
Merge branch 'linux-kernel-device' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:35:27 -07:00 |
|
Brian Behlendorf
|
4683da31f6
|
Merge commit 'refs/top-bases/linux-kernel-device' into linux-kernel-device
|
2010-05-21 15:35:25 -07:00 |
|
Brian Behlendorf
|
c01ea509f6
|
Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:35:02 -07:00 |
|
Brian Behlendorf
|
5e4314a4ed
|
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
|
2010-05-21 15:35:00 -07:00 |
|
Brian Behlendorf
|
29d01df48d
|
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:34:37 -07:00 |
|
Brian Behlendorf
|
8ad18a3e74
|
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
|
2010-05-21 15:34:34 -07:00 |
|
Brian Behlendorf
|
2468e6d67d
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2010-05-21 15:34:11 -07:00 |
|
Brian Behlendorf
|
230510ddac
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2010-05-21 15:34:09 -07:00 |