Brian Behlendorf
|
694bb8c7b6
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:44 -08:00 |
|
Brian Behlendorf
|
b355788b7b
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 13:38:43 -08:00 |
|
Brian Behlendorf
|
ba066a4680
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:39 -08:00 |
|
Brian Behlendorf
|
c1e34481d8
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 13:38:38 -08:00 |
|
Brian Behlendorf
|
5450f26f31
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:35 -08:00 |
|
Brian Behlendorf
|
c63b2754b7
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 13:38:33 -08:00 |
|
Brian Behlendorf
|
4086762d99
|
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:30 -08:00 |
|
Brian Behlendorf
|
0590c2a818
|
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
|
2008-12-17 13:38:28 -08:00 |
|
Brian Behlendorf
|
39fc234440
|
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:25 -08:00 |
|
Brian Behlendorf
|
9b2e31eaff
|
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
|
2008-12-17 13:38:24 -08:00 |
|
Brian Behlendorf
|
02e1565b32
|
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:21 -08:00 |
|
Brian Behlendorf
|
cd76848d7c
|
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
|
2008-12-17 13:38:19 -08:00 |
|
Brian Behlendorf
|
dd3e66444a
|
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:16 -08:00 |
|
Brian Behlendorf
|
5139d459e7
|
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
|
2008-12-17 13:38:15 -08:00 |
|
Brian Behlendorf
|
e7344a52aa
|
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:11 -08:00 |
|
Brian Behlendorf
|
2fc6a9f8d5
|
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
|
2008-12-17 13:38:10 -08:00 |
|
Brian Behlendorf
|
8daaf9ef2f
|
Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:07 -08:00 |
|
Brian Behlendorf
|
6a6463a6a6
|
Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl
|
2008-12-17 13:38:05 -08:00 |
|
Brian Behlendorf
|
e3a7ec8d30
|
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:38:02 -08:00 |
|
Brian Behlendorf
|
4a07f548c1
|
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
|
2008-12-17 13:38:01 -08:00 |
|
Brian Behlendorf
|
b75870bf7e
|
Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:57 -08:00 |
|
Brian Behlendorf
|
17ce6fed40
|
Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr
|
2008-12-17 13:37:56 -08:00 |
|
Brian Behlendorf
|
0b6647c0eb
|
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:53 -08:00 |
|
Brian Behlendorf
|
761898107f
|
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
|
2008-12-17 13:37:52 -08:00 |
|
Brian Behlendorf
|
66a666208d
|
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
|
2008-12-17 13:37:51 -08:00 |
|
Brian Behlendorf
|
fcfb00c295
|
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:46 -08:00 |
|
Brian Behlendorf
|
cacdbdba2f
|
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
|
2008-12-17 13:37:44 -08:00 |
|
Brian Behlendorf
|
b8aa33f141
|
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
|
2008-12-17 13:37:44 -08:00 |
|
Brian Behlendorf
|
6416d046ef
|
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:38 -08:00 |
|
Brian Behlendorf
|
5e52da1e22
|
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
|
2008-12-17 13:37:37 -08:00 |
|
Brian Behlendorf
|
18ab09435e
|
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:33 -08:00 |
|
Brian Behlendorf
|
7d1b25f030
|
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
|
2008-12-17 13:37:32 -08:00 |
|
Brian Behlendorf
|
533df3330e
|
Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:29 -08:00 |
|
Brian Behlendorf
|
7139f15b92
|
Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi
|
2008-12-17 13:37:27 -08:00 |
|
Brian Behlendorf
|
d1fd636e62
|
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:24 -08:00 |
|
Brian Behlendorf
|
1c2420acb7
|
Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
|
2008-12-17 13:37:23 -08:00 |
|
Brian Behlendorf
|
dc35cff3c6
|
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:20 -08:00 |
|
Brian Behlendorf
|
f2da299a89
|
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
|
2008-12-17 13:37:18 -08:00 |
|
Brian Behlendorf
|
1935b1ae87
|
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:15 -08:00 |
|
Brian Behlendorf
|
97ca2458ec
|
Merge commit 'refs/top-bases/linux-docs' into linux-docs
|
2008-12-17 13:37:14 -08:00 |
|
Brian Behlendorf
|
3be083292c
|
Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:37:10 -08:00 |
|
Brian Behlendorf
|
40e8e4a60e
|
Merge commit 'refs/top-bases/linux-arc' into linux-arc
|
2008-12-17 13:37:09 -08:00 |
|
Brian Behlendorf
|
ba3d5afa54
|
Add missing \
|
2008-12-17 13:35:06 -08:00 |
|
Brian Behlendorf
|
052347f663
|
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
|
2008-12-17 13:12:16 -08:00 |
|
Brian Behlendorf
|
06e0b7c068
|
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:12:15 -08:00 |
|
Brian Behlendorf
|
d47d7cdbb5
|
Merge commit 'refs/top-bases/linux-unused' into linux-unused
|
2008-12-17 13:12:14 -08:00 |
|
Brian Behlendorf
|
3bee6fdada
|
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:12:10 -08:00 |
|
Brian Behlendorf
|
9387ecc990
|
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
|
2008-12-17 13:12:09 -08:00 |
|
Brian Behlendorf
|
bc7b8ab098
|
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
|
2008-12-17 13:12:06 -08:00 |
|
Brian Behlendorf
|
5efd2c3d79
|
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
|
2008-12-17 13:12:04 -08:00 |